From 60c589aeb1f1df8a172a12c2e603ef909dfff720 Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Thu, 13 Aug 2015 15:37:21 -0400
Subject: [PATCH] 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
---
docker/centos/source/cinder/cinder-base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
index f07058bb9c..7021a33bf9 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