aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-14 09:03:05 +0000
committerGerrit Code Review <review@openstack.org>2015-08-14 09:03:05 +0000
commit092f3ded94895b777b86642993f006baba37d27a (patch)
tree4032ba4460b49a9c5277825ece35d46dcbc4f816 /docker/centos/source
parentf5084d9668b5b08b4ec9a5728023b6a4f8829bd5 (diff)
parent0c92cc1b3f0cdbdfbd1b01450648dbabe0ff44ae (diff)
downloadkolla-092f3ded94895b777b86642993f006baba37d27a.tar.gz
kolla-092f3ded94895b777b86642993f006baba37d27a.zip
Merge "Magnum install from source incorrectly places config"
Diffstat (limited to 'docker/centos/source')
-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