aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2015-08-13 16:06:40 -0400
committerRyan Hallisey <rhallise@redhat.com>2015-08-13 16:16:37 -0400
commit0c92cc1b3f0cdbdfbd1b01450648dbabe0ff44ae (patch)
tree0696752c85d84d37b8b820ff463a266e52681307 /docker
parent77e08a1f5fff1db65355ef3a07319cdb1e523e79 (diff)
downloadkolla-0c92cc1b3f0cdbdfbd1b01450648dbabe0ff44ae.tar.gz
kolla-0c92cc1b3f0cdbdfbd1b01450648dbabe0ff44ae.zip
Magnum install from source incorrectly places config
The magnum base Dockerfile is placing magnum.conf in /etc/magnum/magnum/magnum.conf. It should be in /etc/magnum/magnum.conf. We need to still cp everything in that directory because there is more than just the config. Change-Id: I7aa85f465fbd29a882c6628970cade732c818d8f Co-Authored-By: Ian Main <imain@redhat.com> Closes-Bug: #1484675
Diffstat (limited to 'docker')
-rw-r--r--docker/centos/source/magnum/magnum-base/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/centos/source/magnum/magnum-base/Dockerfile b/docker/centos/source/magnum/magnum-base/Dockerfile
index ffcee610f..9cca847fb 100644
--- a/docker/centos/source/magnum/magnum-base/Dockerfile
+++ b/docker/centos/source/magnum/magnum-base/Dockerfile
@@ -9,5 +9,5 @@ RUN cd /magnum \
&& pip install -r requirements.txt \
&& pip install /magnum \
&& mkdir /etc/magnum /var/log/magnum \
- && cp -r /magnum/etc/* /etc/magnum/ \
+ && cp -r /magnum/etc/* /etc/ \
&& rm -rf /root/.cache