aboutsummaryrefslogtreecommitdiff
path: root/docker/centos
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-14 08:58:44 +0000
committerGerrit Code Review <review@openstack.org>2015-08-14 08:58:44 +0000
commit512d64a97826b2f047130e97f9be62e45a2a3808 (patch)
tree1d41e1649174211755d8bbe72859d40a12e2301c /docker/centos
parent98654a313e9c93178dc8f6319b13a03cbcf91c05 (diff)
parent60c589aeb1f1df8a172a12c2e603ef909dfff720 (diff)
downloadkolla-512d64a97826b2f047130e97f9be62e45a2a3808.tar.gz
kolla-512d64a97826b2f047130e97f9be62e45a2a3808.zip
Merge "Cinder install from source incorrectly places config"
Diffstat (limited to 'docker/centos')
-rw-r--r--docker/centos/source/cinder/cinder-base/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
index f07058bb9..7021a33bf 100644
--- a/docker/centos/source/cinder/cinder-base/Dockerfile
+++ b/docker/centos/source/cinder/cinder-base/Dockerfile
@@ -9,6 +9,6 @@ RUN cd /cinder \
&& pip install -r requirements.txt \
&& pip install /cinder \
&& mkdir /etc/cinder /var/log/cinder \
- && cp -r /cinder/etc/cinder/* /etc/cinder/ \
+ && cp -r /cinder/etc/cinder/* /etc/ \
&& chown -R cinder: /etc/cinder /var/log/cinder \
&& rm -rf /root/.cache