From 91e7a548cb4e39e72798c8cda16f3a946128a419 Mon Sep 17 00:00:00 2001
From: Martin André <m.andre@redhat.com>
Date: Wed, 29 Mar 2017 14:11:21 +0200
Subject: Remove kolla_config copy from services

Simplify the config of the containerized services by bind mounting in
the configurations instead of specifying them all in kolla config.

This is change is useful to limit the side effects of generating the
config files and running the container is two separate steps as config
directories are now bind-mounted inside the container instead of having
files being copied to the container. We've seen examples of Apache's
mod_ssl configuration file present on the container preventing it to
start when puppet configured apache not to load the ssl module (in case
TLS is disabled).

Co-Authored-By: Ian Main <imain@redhat.com>
Change-Id: I4ec5dd8b360faea71a044894a61790997f54d48a
---
 docker/services/aodh-api.yaml          | 32 +++-------------
 docker/services/aodh-evaluator.yaml    | 11 ++----
 docker/services/aodh-listener.yaml     | 11 ++----
 docker/services/aodh-notifier.yaml     | 11 ++----
 docker/services/database/mongodb.yaml  | 11 +-----
 docker/services/database/mysql.yaml    | 15 ++------
 docker/services/glance-api.yaml        | 15 ++------
 docker/services/gnocchi-api.yaml       | 32 +++-------------
 docker/services/gnocchi-metricd.yaml   | 11 ++----
 docker/services/gnocchi-statsd.yaml    | 11 ++----
 docker/services/heat-api-cfn.yaml      | 13 ++-----
 docker/services/heat-api.yaml          | 13 ++-----
 docker/services/heat-engine.yaml       | 15 +++-----
 docker/services/ironic-api.yaml        | 13 ++-----
 docker/services/ironic-conductor.yaml  | 25 +++++--------
 docker/services/ironic-pxe.yaml        | 67 +++++++++-------------------------
 docker/services/keystone.yaml          |  4 +-
 docker/services/mistral-api.yaml       | 15 ++------
 docker/services/mistral-engine.yaml    | 12 ++----
 docker/services/mistral-executor.yaml  | 13 ++-----
 docker/services/neutron-api.yaml       | 15 ++------
 docker/services/neutron-dhcp.yaml      | 15 ++------
 docker/services/neutron-l3.yaml        | 17 ++-------
 docker/services/neutron-ovs-agent.yaml | 15 +-------
 docker/services/nova-api.yaml          | 11 ++----
 docker/services/nova-compute.yaml      | 13 +------
 docker/services/nova-conductor.yaml    | 13 ++-----
 docker/services/nova-ironic.yaml       | 11 +-----
 docker/services/nova-libvirt.yaml      | 11 ++----
 docker/services/nova-placement.yaml    | 36 +++---------------
 docker/services/nova-scheduler.yaml    | 13 ++-----
 docker/services/panko-api.yaml         | 30 +++------------
 docker/services/rabbitmq.yaml          | 21 +----------
 docker/services/swift-proxy.yaml       |  4 +-
 docker/services/swift-storage.yaml     | 13 -------
 docker/services/zaqar.yaml             | 18 +--------
 36 files changed, 133 insertions(+), 473 deletions(-)

diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index ca410d6d..32294958 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -58,29 +58,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhApiImage} ]
       kolla_config:
-          /var/lib/kolla/config_files/aodh-api.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/aodh/aodh.conf
-             owner: aodh
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/aodh/aodh.conf
-           - dest: /etc/httpd/conf.d/10-aodh_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-aodh_wsgi.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-           - dest: /var/www/cgi-bin/aodh/app
-             owner: aodh
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/aodh/app
+        /var/lib/kolla/config_files/aodh-api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
           aodh-init-log:
@@ -97,7 +76,7 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log
@@ -110,8 +89,9 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/aodh/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+              - /var/lib/config-data/aodh/etc/httpd/:/etc/httpd/:ro
+              - /var/lib/config-data/aodh/var/www/:/var/www/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log
diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index d3c8c595..1553df3c 100644
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -57,13 +57,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/aodh-evaluator.json:
-           command: /usr/bin/aodh-evaluator
-           config_files:
-           - dest: /etc/aodh/aodh.conf
-             owner: aodh
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/aodh/aodh.conf
+        /var/lib/kolla/config_files/aodh-evaluator.json:
+          command: /usr/bin/aodh-evaluator
       docker_config:
         step_4:
           aodh_evaluator:
@@ -73,7 +68,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 7aa9618d..300dfde3 100644
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -57,13 +57,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/aodh-listener.json:
-           command: /usr/bin/aodh-listener
-           config_files:
-           - dest: /etc/aodh/aodh.conf
-             owner: aodh
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/aodh/aodh.conf
+        /var/lib/kolla/config_files/aodh-listener.json:
+          command: /usr/bin/aodh-listener
       docker_config:
         step_4:
           aodh_listener:
@@ -73,7 +68,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/aodh-listener.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index f525d6bd..b4056603 100644
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@@ -57,13 +57,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhNotifierImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/aodh-notifier.json:
-           command: /usr/bin/aodh-notifier
-           config_files:
-           - dest: /etc/aodh/aodh.conf
-             owner: aodh
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/aodh/aodh.conf
+        /var/lib/kolla/config_files/aodh-notifier.json:
+          command: /usr/bin/aodh-notifier
       docker_config:
         step_4:
           aodh_notifier:
@@ -73,7 +68,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/aodh-notifier.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 15795828..5756c322 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -62,15 +62,6 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/mongodb.json:
           command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
-          config_files:
-          - dest: /etc/mongod.conf
-            source: /var/lib/kolla/config_files/src/etc/mongod.conf
-            owner: mongodb
-            perm: '0600'
-          - dest: /etc/mongos.conf
-            source: /var/lib/kolla/config_files/src/etc/mongos.conf
-            owner: mongodb
-            perm: '0600'
       docker_config:
         step_2:
           mongodb_data_ownership:
@@ -88,7 +79,7 @@ outputs:
             privileged: false
             volumes: &mongodb_volumes
               - /var/lib/kolla/config_files/mongodb.json:/var/lib/kolla/config_files/config.json
-              - /var/lib/config-data/mongodb/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/mongodb/etc/:/etc/:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log/kolla
               - /var/lib/mongodb:/var/lib/mongodb
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 0ffd0336..372f059c 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -71,15 +71,6 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/bin/mysqld_safe
-          config_files:
-          - dest: /etc/mysql/my.cnf
-            source: /var/lib/kolla/config_files/src/etc/my.cnf
-            owner: mysql
-            perm: '0644'
-          - dest: /etc/my.cnf.d/galera.cnf
-            source: /var/lib/kolla/config_files/src/etc/my.cnf.d/galera.cnf
-            owner: mysql
-            perm: '0644'
       docker_config:
         step_2:
           mysql_data_ownership:
@@ -101,7 +92,7 @@ outputs:
             command: ['bash', '-c', 'test -e /var/lib/mysql/mysql || kolla_start']
             volumes: &mysql_volumes
               - /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json
-              - /var/lib/config-data/mysql/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/mysql/etc/:/etc/:ro
               - /etc/localtime:/etc/localtime:ro
               - /etc/hosts:/etc/hosts:ro
               - /var/lib/mysql:/var/lib/mysql
@@ -137,8 +128,8 @@ outputs:
           step_config: 'include ::tripleo::profile::base::database::mysql'
           config_image: *mysql_image
           volumes:
-            - "/var/lib/mysql:/var/lib/mysql/:ro"
-            - "/var/lib/config-data/mysql/root:/root:ro" #provides .my.cnf
+            - /var/lib/mysql:/var/lib/mysql/:ro
+            - /var/lib/config-data/mysql/root:/root:ro #provides .my.cnf
       host_prep_tasks:
         - name: create /var/lib/mysql
           file:
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index 77e4aa01..fdfdbc68 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -58,17 +58,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/glance-api.json:
-           command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf
-           config_files:
-           - dest: /etc/glance/glance-api.conf
-             owner: glance
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/glance/glance-api.conf
-           - dest: /etc/glance/glance-swift.conf
-             owner: glance
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/glance/glance-swift.conf
+        /var/lib/kolla/config_files/glance-api.json:
+          command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf
       docker_config:
         step_3:
           glance_api_db_sync:
@@ -78,9 +69,9 @@ outputs:
             detach: false
             volumes: &glance_volumes
               - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json
+              - /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
-              - /var/lib/config-data/glance_api/:/var/lib/kolla/config_files/src:ro
               - /run:/run
               - /dev:/dev
               - /etc/hosts:/etc/hosts:ro
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index a64d1507..08f4b56b 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -58,29 +58,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiApiImage} ]
       kolla_config:
-          /var/lib/kolla/config_files/gnocchi-api.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/gnocchi/gnocchi.conf
-             owner: gnocchi
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/gnocchi/gnocchi.conf
-           - dest: /etc/httpd/conf.d/10-gnocchi_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-gnocchi_wsgi.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-           - dest: /var/www/cgi-bin/gnocchi/app
-             owner: gnocchi
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/gnocchi/app
+        /var/lib/kolla/config_files/gnocchi-api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
           gnocchi-init-log:
@@ -97,7 +76,7 @@ outputs:
             detach: false
             privileged: false
             volumes:
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi:ro
+              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log
@@ -110,8 +89,9 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/gnocchi/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+              - /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro
+              - /var/lib/config-data/gnocchi/var/www/:/var/www/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index 6437e942..6b41eaa3 100644
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@@ -55,13 +55,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/gnocchi-metricd.json:
-           command: /usr/bin/gnocchi-metricd
-           config_files:
-           - dest: /etc/gnocchi/gnocchi.conf
-             owner: gnocchi
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/gnocchi/gnocchi.conf
+        /var/lib/kolla/config_files/gnocchi-metricd.json:
+          command: /usr/bin/gnocchi-metricd
       docker_config:
         step_4:
           gnocchi_metricd:
@@ -71,7 +66,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/gnocchi-metricd.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index 32c16521..93b616c4 100644
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -55,13 +55,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/gnocchi-statsd.json:
-           command: /usr/bin/gnocchi-statsd
-           config_files:
-           - dest: /etc/gnocchi/gnocchi.conf
-             owner: gnocchi
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/gnocchi/gnocchi.conf
+        /var/lib/kolla/config_files/gnocchi-statsd.json:
+          command: /usr/bin/gnocchi-statsd
       docker_config:
         step_4:
           gnocchi_statsd:
@@ -71,7 +66,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index 85ad9212..e1226471 100644
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -64,13 +64,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/heat_api_cfn.json:
-           command: /usr/bin/heat-api-cfn --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
-           config_files:
-           - dest: /etc/heat/heat.conf
-             owner: heat
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/heat/heat.conf
+        /var/lib/kolla/config_files/heat_api_cfn.json:
+          command: /usr/bin/heat-api-cfn --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
       docker_config:
         step_4:
           heat_api_cfn:
@@ -82,12 +77,12 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/heat/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /dev:/dev
+              - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 12884f56..3212d909 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -64,13 +64,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/heat_api.json:
-           command: /usr/bin/heat-api --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
-           config_files:
-           - dest: /etc/heat/heat.conf
-             owner: heat
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/heat/heat.conf
+        /var/lib/kolla/config_files/heat_api.json:
+          command: /usr/bin/heat-api --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
       docker_config:
         step_4:
           heat_api:
@@ -82,12 +77,12 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/heat/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /dev:/dev
+              - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 85a00b1d..83c63095 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -59,13 +59,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/heat_engine.json:
-           command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
-           config_files:
-           - dest: /etc/heat/heat.conf
-             owner: heat
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/heat/heat.conf
+        /var/lib/kolla/config_files/heat_engine.json:
+          command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf
       docker_config:
         step_3:
           heat_engine_db_sync:
@@ -74,7 +69,7 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/heat/etc/heat:/etc/heat:ro
+              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             command: ['heat-manage', 'db_sync']
@@ -85,11 +80,11 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/heat/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
+              - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 5ae82d46..bef84e2e 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -61,13 +61,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_api.json:
-           command: /usr/bin/ironic-api
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
+        /var/lib/kolla/config_files/ironic_api.json:
+          command: /usr/bin/ironic-api
       docker_config:
         step_3:
           ironic_db_sync:
@@ -82,8 +77,6 @@ outputs:
               - /var/lib/config-data/ironic/etc/:/etc/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf']
         step_4:
           ironic_api:
@@ -94,7 +87,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/ironic/etc/:/etc/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 678b8c27..f07fb47c 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -69,20 +69,15 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_conductor.json:
-           command: /usr/bin/ironic-conductor
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
-           permissions:
-           - path: /var/lib/ironic/httpboot
-             owner: ironic:ironic
-             recurse: true
-           - path: /var/lib/ironic/tftpboot
-             owner: ironic:ironic
-             recurse: true
+        /var/lib/kolla/config_files/ironic_conductor.json:
+          command: /usr/bin/ironic-conductor
+          permissions:
+            - path: /var/lib/ironic/httpboot
+              owner: ironic:ironic
+              recurse: true
+            - path: /var/lib/ironic/tftpboot
+              owner: ironic:ironic
+              recurse: true
       docker_config:
         step_4:
           ironic_conductor:
@@ -96,7 +91,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index c6607094..51538e73 100644
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -49,52 +49,10 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_pxe_http.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
-           - dest: /etc/httpd/conf.d/10-ipxe_vhost.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-ipxe_vhost.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-         /var/lib/kolla/config_files/ironic_pxe_tftp.json:
-           command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
-           - dest: /var/lib/ironic/tftpboot/chain.c32
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/chain.c32
-           - dest: /var/lib/ironic/tftpboot/pxelinux.0
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/pxelinux.0
-           - dest: /var/lib/ironic/tftpboot/ipxe.efi
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/ipxe.efi
-           - dest: /var/lib/ironic/tftpboot/undionly.kpxe
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/undionly.kpxe
-           - dest: /var/lib/ironic/tftpboot/map-file
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/map-file
+        /var/lib/kolla/config_files/ironic_pxe_http.json:
+          command: /usr/sbin/httpd -DFOREGROUND
+        /var/lib/kolla/config_files/ironic_pxe_tftp.json:
+          command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
       docker_config:
         step_4:
           ironic_pxe_tftp:
@@ -108,11 +66,20 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+              # TODO(mandre) check how docker like mounting in a bind-mounted tree
+              # This directory may contain migrated data from BM
+              - /var/lib/ironic:/var/lib/ironic/
+              # These files were generated by puppet inside the config container
+              # TODO(mandre) check the mount permission (ro/rw)
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/ipxe.efi:/var/lib/ironic/tftpboot/ipxe.efi
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/undionly.kpxe:/var/lib/ironic/tftpboot/undionly.kpxe
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/map-file:/var/lib/ironic/tftpboot/map-file
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /dev/log:/dev/log
-              - /var/lib/ironic:/var/lib/ironic/
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           ironic_pxe_http:
@@ -123,8 +90,8 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/ironic/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+              - /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/ironic:/var/lib/ironic/
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 0597b906..90ddeb9f 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -71,8 +71,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/keystone.json:
-           command: /usr/sbin/httpd -DFOREGROUND
+        /var/lib/kolla/config_files/keystone.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
           keystone-init-log:
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 4dd3b74c..5b5e1f50 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -61,13 +61,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/mistral_api.json:
-           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api
-           config_files:
-           - dest: /etc/mistral/mistral.conf
-             owner: mistral
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+        /var/lib/kolla/config_files/mistral_api.json:
+          command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api
       docker_config:
         step_3:
           mistral_db_sync:
@@ -83,8 +78,6 @@ outputs:
               - /var/lib/config-data/mistral/etc/:/etc/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'upgrade', 'head']
           mistral_db_populate:
             start_order: 2
@@ -96,8 +89,6 @@ outputs:
               - /var/lib/config-data/mistral/etc/:/etc/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             # NOTE: dprince this requires that we install openstack-tripleo-common into
             # the Mistral API image so that we get tripleo* actions
             command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'populate']
@@ -110,7 +101,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index db2721bd..feecd5d7 100644
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@@ -62,13 +62,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/mistral_engine.json:
-           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/engine.log --server=engine
-           config_files:
-           - dest: /etc/mistral/mistral.conf
-             owner: mistral
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+        /var/lib/kolla/config_files/mistral_engine.json:
+          command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/engine.log --server=engine
       docker_config:
         step_4:
           mistral_engine:
@@ -82,7 +77,7 @@ outputs:
             volumes:
               - /run:/run
               - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
@@ -91,4 +86,3 @@ outputs:
         - name: Stop and disable mistral_engine service
           tags: step2
           service: name=openstack-mistral-engine state=stopped enabled=no
-
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index d68830ed..45fed7b2 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -62,13 +62,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/mistral_executor.json:
-           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
-           config_files:
-           - dest: /etc/mistral/mistral.conf
-             owner: mistral
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+        /var/lib/kolla/config_files/mistral_executor.json:
+          command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
       docker_config:
         step_4:
           mistral_executor:
@@ -80,11 +75,11 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
+              - /run:/run
               # FIXME: this is required in order for Nova cells
               # initialization workflows on the Undercloud. Need to
               # exclude this on the overcloud for security reasons.
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index ed03de6c..c5001a30 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -62,17 +62,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/neutron_api.json:
-           command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini
-           config_files:
-           - dest: /etc/neutron/neutron.conf
-             owner: neutron
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/neutron/neutron.conf
-           - dest: /etc/neutron/plugin.ini
-             owner: neutron
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/neutron/plugins/ml2/ml2_conf.ini
+        /var/lib/kolla/config_files/neutron_api.json:
+          command: /usr/bin/neutron-server --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini
       docker_config:
         step_3:
           neutron_db_sync:
@@ -100,7 +91,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 9be13ad3..03fbf766 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -62,17 +62,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/neutron_dhcp.json:
-           command: /usr/bin/neutron-dhcp-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --log-file /var/log/neutron/dhcp-agent.log
-           config_files:
-           - dest: /etc/neutron/neutron.conf
-             owner: neutron
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/neutron/neutron.conf
-           - dest: /etc/neutron/dhcp_agent.ini
-             owner: neutron
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/neutron/dhcp_agent.ini
+        /var/lib/kolla/config_files/neutron_dhcp.json:
+          command: /usr/bin/neutron-dhcp-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --log-file /var/log/neutron/dhcp-agent.log
       docker_config:
         step_4:
           neutron_dhcp:
@@ -86,7 +77,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
               - /etc/localtime:/etc/localtime:ro
               - /etc/hosts:/etc/hosts:ro
               - /lib/modules:/lib/modules:ro
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index db4fa863..0b04b56d 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -59,30 +59,21 @@ outputs:
             - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/neutron-l3-agent.json:
-           command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini
-           config_files:
-           - dest: /etc/neutron/neutron.conf
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/neutron.conf
-           - dest: /etc/neutron/l3_agent.ini
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/neutron/l3_agent.ini
+          command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini
       docker_config:
         step_4:
           neutronl3agent:
             image:
               list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
             net: host
             pid: host
             privileged: true
             restart: always
             volumes:
               - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
               - /run:/run
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 4102693b..bea08e91 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -55,19 +55,6 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/neutron-openvswitch-agent.json:
            command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
-           config_files:
-           - dest: /etc/neutron/neutron.conf
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/neutron.conf
-           - dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/plugins/ml2/openvswitch_agent.ini
-           - dest: /etc/neutron/plugins/ml2/ml2_conf.ini
-             owner: neutron
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/neutron/plugins/ml2/ml2_conf.ini
       docker_config:
         step_4:
           neutronovsagent:
@@ -78,7 +65,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
               - /run:/run
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index e5c78d6c..4cd48b75 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -62,13 +62,8 @@ outputs:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/nova_api.json:
-           command: /usr/bin/nova-api
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
+        /var/lib/kolla/config_files/nova_api.json:
+          command: /usr/bin/nova-api
       docker_config:
         step_3:
           nova_api_db_sync:
@@ -129,7 +124,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 957eed7f..eefcb367 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -55,16 +55,7 @@ outputs:
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
       kolla_config:
         /var/lib/kolla/config_files/nova-compute.json:
-           command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
-           - dest: /etc/nova/rootwrap.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/rootwrap.conf
+          command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
       docker_config:
         # FIXME: run discover hosts here
         step_4:
@@ -76,7 +67,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova_libvirt:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
               - /dev:/dev
               - /etc/iscsi:/etc/iscsi
               - /etc/localtime:/etc/localtime:ro
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index f85cf546..b7a1d742 100644
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -60,13 +60,8 @@ outputs:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/nova_conductor.json:
-           command: /usr/bin/nova-conductor
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
+        /var/lib/kolla/config_files/nova_conductor.json:
+          command: /usr/bin/nova-conductor
       docker_config:
         step_4:
           nova_conductor:
@@ -78,11 +73,11 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
+              - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 3d849f59..9941abda 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -58,15 +58,6 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/nova_ironic.json:
            command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
-           - dest: /etc/nova/rootwrap.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/rootwrap.conf
       docker_config:
         step_5:
           novacompute:
@@ -80,7 +71,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
               - /dev:/dev
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 480bb80e..15cee597 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -60,12 +60,7 @@ outputs:
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/nova-libvirt.json:
-           command: /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf
-           config_files:
-           - dest: /etc/libvirt/libvirtd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/libvirt/libvirtd.conf
+          command: /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf
       docker_config:
         step_3:
           nova_libvirt:
@@ -79,10 +74,10 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova_libvirt:/var/lib/kolla/config_files/src:ro
-              - /dev:/dev
+              - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
+              - /dev:/dev
               - /run:/run
               - /sys/fs/cgroup:/sys/fs/cgroup
               - /var/lib/nova:/var/lib/nova
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index e49839b5..0c595dc2 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -58,35 +58,8 @@ outputs:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/nova_placement.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
-           - dest: /etc/httpd/conf.d/10-placement_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-placement_wsgi.conf
-           # puppet generates a stubbed out version of the stock one so we
-           # copy it in to overwrite the existing one
-           - dest: /etc/httpd/conf.d/00-nova-placement-api.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/00-nova-placement-api.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-           - dest: /var/www/cgi-bin/nova/nova-placement-api
-             owner: nova
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/nova/nova-placement-api
+        /var/lib/kolla/config_files/nova_placement.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         # start this early so it is up before computes start reporting
         step_3:
@@ -98,8 +71,9 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova_placement/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/nova_placement/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
+              - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
+              - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index de1199e1..e6f4896b 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -59,13 +59,8 @@ outputs:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/nova_scheduler.json:
-           command: /usr/bin/nova-scheduler
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
+        /var/lib/kolla/config_files/nova_scheduler.json:
+          command: /usr/bin/nova-scheduler
       docker_config:
         step_4:
           nova_scheduler:
@@ -77,11 +72,11 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
               - /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
+              - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index 32efc5d7..f4f1f7b0 100644
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -58,29 +58,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerPankoApiImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/panko-api.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/httpd/conf.d/10-panko_wsgi.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-panko_wsgi.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-           - dest: /etc/panko/panko.conf
-             owner: panko
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/panko/panko.conf
-           - dest: /var/www/cgi-bin/panko/app
-             owner: panko
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/www/cgi-bin/panko/app
+        /var/lib/kolla/config_files/panko-api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
       docker_config:
         step_3:
           panko-init-log:
@@ -111,8 +90,9 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/panko/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/panko/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/panko/etc/panko/:/etc/panko/:ro
+              - /var/lib/config-data/panko/etc/httpd/:/etc/httpd/:ro
+              - /var/lib/config-data/panko/var/www/:/var/www/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index 341ec3de..9d5a52a6 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -61,23 +61,6 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
           command: /usr/lib/rabbitmq/bin/rabbitmq-server
-          config_files:
-          - dest: /etc/rabbitmq/rabbitmq.config
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/rabbitmq.config
-          - dest: /etc/rabbitmq/enabled_plugins
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/enabled_plugins
-          - dest: /etc/rabbitmq/rabbitmq-env.conf
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/rabbitmq-env.conf
-          - dest: /etc/rabbitmq/rabbitmqadmin.conf
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/rabbitmqadmin.conf
       docker_config:
         step_1:
           rabbitmq_bootstrap:
@@ -87,7 +70,7 @@ outputs:
             privileged: false
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq
@@ -113,7 +96,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/lib/rabbitmq:/var/lib/rabbitmq
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 0d7cd7b9..e60aca12 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -64,10 +64,10 @@ outputs:
             net: host
             user: swift
             restart: always
-            # I'm mounting /etc/swift as rw.  Are the rings written to at all during runtime?
             volumes:
               - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift:/var/lib/kolla/config_files/src:ro
+              # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
+              # at all during runtime?
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 301ef69b..cccddb46 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -115,7 +115,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -131,7 +130,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -146,7 +144,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -161,7 +158,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -179,7 +175,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -194,7 +189,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -209,7 +203,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -224,7 +217,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -242,7 +234,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -257,7 +248,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -272,7 +262,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -287,7 +276,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -302,7 +290,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index 3ec819e0..21aff31a 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -57,22 +57,8 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/zaqar.json:
           command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf
-          config_files:
-          - dest: /etc/zaqar/zaqar.conf
-            owner: zaqar
-            perm: '0640'
-            source: /var/lib/kolla/config_files/src/etc/zaqar/zaqar.conf
         /var/lib/kolla/config_files/zaqar_websocket.json:
           command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf --config-file /etc/zaqar/1.conf
-          config_files:
-          - dest: /etc/zaqar/zaqar.conf
-            owner: zaqar
-            perm: '0640'
-            source: /var/lib/kolla/config_files/src/etc/zaqar/zaqar.conf
-          - dest: /etc/zaqar/1.conf
-            owner: zaqar
-            perm: '0640'
-            source: /var/lib/kolla/config_files/src/etc/zaqar/1.conf
       docker_config:
         step_4:
           zaqar:
@@ -82,7 +68,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/zaqar/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
@@ -94,7 +80,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/zaqar/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
-- 
cgit 1.2.3-korg