diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-11-17 17:38:29 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-11-18 12:10:38 +0000 |
| commit | 2e50ead57ef6274086c825660efd89850947daca (patch) | |
| tree | 375dc5b750c2b607c1ce2805aae7d4d1d643e6d9 /docker | |
| parent | 4cddefe7d77166b3b328862821e392f87d55ba97 (diff) | |
| download | kolla-2e50ead57ef6274086c825660efd89850947daca.tar.gz kolla-2e50ead57ef6274086c825660efd89850947daca.zip | |
Fix missing policy.json in Magnum
The magnum api falls over on a request without this file in place
Change-Id: Ic7ff8af22c3142d93e0dcf2b2ed5455685dec658
Closes-Bug: #1517152
Diffstat (limited to 'docker')
| -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 %} |