diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-18 14:13:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-18 14:13:05 +0000 |
| commit | c316da2c551ed1600d2b108ddc04daee28977ff4 (patch) | |
| tree | 91de03ebffbe50cfab825fbb6362710ac528434a | |
| parent | d1a0aa76eabae2a41266299ebf4ccc10f3b3a3e2 (diff) | |
| parent | 2e50ead57ef6274086c825660efd89850947daca (diff) | |
| download | kolla-c316da2c551ed1600d2b108ddc04daee28977ff4.tar.gz kolla-c316da2c551ed1600d2b108ddc04daee28977ff4.zip | |
Merge "Fix missing policy.json in Magnum"
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 06cad1d5b..46f4b04ff 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -23,7 +23,7 @@ RUN ln -s magnum-base-source/* magnum \ && useradd --user-group magnum \ && pip --no-cache-dir install -c requirements/upper-constraints.txt /magnum \ && mkdir -p /etc/magnum /var/log/magnum /home/magnum \ - && cp -r /magnum/etc/* /etc/magnum/ \ + && cp -r /magnum/etc/magnum/* /etc/magnum \ && chown -R magnum: /etc/magnum /var/log/magnum /home/magnum {% endif %} |