aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2015-08-13 15:37:21 -0400
committerRyan Hallisey <rhallise@redhat.com>2015-08-13 15:37:38 -0400
commit60c589aeb1f1df8a172a12c2e603ef909dfff720 (patch)
treef5c5a6536e35996a2b3b5d5eb7c3138baa742f46 /docker
parentfa9492e6c65648706998580f10a71976eab4af30 (diff)
downloadkolla-60c589aeb1f1df8a172a12c2e603ef909dfff720.tar.gz
kolla-60c589aeb1f1df8a172a12c2e603ef909dfff720.zip
Cinder install from source incorrectly places config
The cinder base Dockerfile is placing cinder.conf in /etc/cinder/cinder/cinder.conf. It should be in /etc/cinder/cinder.conf. Change-Id: I1d1779ea3fa3ff4e9b7876689121ff9e6da756bd Co-Authored-By: Ian Main <imain@redhat.com> Closes-Bug: #1484662
Diffstat (limited to 'docker')
-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