From 726a80cd1dbd5312f1d1dd431707ddeb3a063ecd Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Fri, 14 Aug 2015 10:58:09 -0400
Subject: [PATCH] Refactor where source builds place config files

Many of the services have a nested directory that will
be copied into /etc, which will place the config files one
layer too deep. For example: heat has 'heat/etc/heat/heat.conf'.
Copying 'heat/etc*' to '/etc/heat' will create this extra layer.

Change-Id: Iad4661f0316523c5fe8d029d24a8e4fc68da6e15
Closes-Bug: #1484974
---
 docker/centos/source/barbican/Dockerfile                   | 2 +-
 docker/centos/source/ceilometer/ceilometer-base/Dockerfile | 2 +-
 docker/centos/source/cinder/cinder-base/Dockerfile         | 2 +-
 docker/centos/source/designate/designate-base/Dockerfile   | 2 +-
 docker/centos/source/gnocchi/gnocchi-base/Dockerfile       | 2 +-
 docker/centos/source/heat/heat-base/Dockerfile             | 2 +-
 docker/centos/source/magnum/magnum-base/Dockerfile         | 2 +-
 docker/centos/source/murano/murano-base/Dockerfile         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/centos/source/barbican/Dockerfile b/docker/centos/source/barbican/Dockerfile
index cd4331ac2a..23469321a0 100644
--- a/docker/centos/source/barbican/Dockerfile
+++ b/docker/centos/source/barbican/Dockerfile
@@ -10,7 +10,7 @@ RUN cd /barbican \
     && pip install -r requirements.txt \
     && pip install /barbican \
     && mkdir /etc/barbican /var/log/barbican \
-    && cp -r /barbican/etc/* /etc/ \
+    && cp -r /barbican/etc/* /etc/barbican/ \
     && rm -rf /root/.cache
 
 COPY ./start.sh /start.sh
diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
index 5147241376..0b4e0e63d1 100644
--- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
@@ -9,7 +9,7 @@ RUN cd /ceilometer \
     && pip install -r requirements.txt \
     && pip install /ceilometer \
     && mkdir /etc/ceilometer /var/log/ceilometer \
-    && cp -r /ceilometer/etc/* /etc/ \
+    && cp -r /ceilometer/etc/* /etc/ceilometer/ \
     && rm -rf /root/.cache
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
index 7021a33bf9..f07058bb9c 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/ \
+    && cp -r /cinder/etc/cinder/* /etc/cinder/ \
     && chown -R cinder: /etc/cinder /var/log/cinder \
     && rm -rf /root/.cache
diff --git a/docker/centos/source/designate/designate-base/Dockerfile b/docker/centos/source/designate/designate-base/Dockerfile
index e34c8a971e..f8210a432e 100644
--- a/docker/centos/source/designate/designate-base/Dockerfile
+++ b/docker/centos/source/designate/designate-base/Dockerfile
@@ -9,7 +9,7 @@ RUN cd /designate \
     && pip install -r requirements.txt \
     && pip install /designate \
     && mkdir /etc/designate /var/log/designate \
-    && cp -r /designate/etc/* /etc/ \
+    && cp -r /designate/etc/designate/* /etc/designate/ \
     && rm -rf /root/.cache
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
index 1e1408ec2d..78bd361d87 100644
--- a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
+++ b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
@@ -9,5 +9,5 @@ RUN cd /gnocchi \
     && pip install -r requirements.txt \
     && pip install /gnocchi \
     && mkdir /etc/gnocchi /var/log/gnocchi \
-    && cp -r /gnocchi/etc/* /etc/ \
+    && cp -r /gnocchi/etc/gnocchi/* /etc/gnocchi/ \
     && rm -rf /root/.cache
diff --git a/docker/centos/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile
index 210ac82940..72ff595561 100644
--- a/docker/centos/source/heat/heat-base/Dockerfile
+++ b/docker/centos/source/heat/heat-base/Dockerfile
@@ -9,5 +9,5 @@ RUN cd /heat \
     && pip install -r requirements.txt \
     && pip install /heat \
     && mkdir /etc/heat /var/log/heat \
-    && cp -r /heat/etc/* /etc/ \
+    && cp -r /heat/etc/heat/* /etc/heat/ \
     && rm -rf /root/.cache
diff --git a/docker/centos/source/magnum/magnum-base/Dockerfile b/docker/centos/source/magnum/magnum-base/Dockerfile
index 9cca847fb1..55936981d0 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/ \
+    && cp -r /magnum/etc/magnum/* /etc/magnum/ \
     && rm -rf /root/.cache
diff --git a/docker/centos/source/murano/murano-base/Dockerfile b/docker/centos/source/murano/murano-base/Dockerfile
index 203fc7612d..21de3ece3b 100644
--- a/docker/centos/source/murano/murano-base/Dockerfile
+++ b/docker/centos/source/murano/murano-base/Dockerfile
@@ -10,6 +10,6 @@ RUN cd /murano \
     && mkdir /etc/murano \
     && cd /murano \
     && tox -e genconfig \
-    && cp -r etc/murano/* /etc/ \
+    && cp -r etc/murano/* /etc/murano/ \
     && cp etc/murano/murano.conf.sample /etc/murano/murano.conf \
     && rm -rf /root/.cache