Merge "Introduce common resources for docker templates"

docker/services/aodh-api.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   AodhApiPuppetBase:
       type: ../../puppet/services/aodh-api.yaml
       properties:
@@ -76,10 +79,13 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - logs:/var/log
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                    - logs:/var/log
             command: /usr/bin/aodh-dbsync
         step_4:
           aodh_api:
@@ -88,13 +94,16 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/aodh/etc/httpd/:/etc/httpd/:ro
+                data:
-              - /var/lib/config-data/aodh/var/www/:/var/www/:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/hosts:/etc/hosts:ro
+                  service:
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json:ro
-              - logs:/var/log
+                    - /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
+                    - logs:/var/log
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/aodh-evaluator.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   AodhEvaluatorBase:
     type: ../../puppet/services/aodh-evaluator.yaml
     properties:
@@ -67,10 +70,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/aodh-listener.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   AodhListenerBase:
     type: ../../puppet/services/aodh-listener.yaml
     properties:
@@ -67,10 +70,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/aodh-listener.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/aodh-listener.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/aodh-notifier.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   AodhNotifierBase:
     type: ../../puppet/services/aodh-notifier.yaml
     properties:
@@ -67,10 +70,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/aodh-notifier.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/aodh-notifier.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/containers-common.yaml

@@ -0,0 +1,11 @@
+heat_template_version: ocata
+
+description: >
+  Contains a static list of common things necessary for containers
+
+outputs:
+  volumes:
+    description: Common volumes for the containers.
+    value:
+      - /etc/hosts:/etc/hosts:ro
+      - /etc/localtime:/etc/localtime:ro

docker/services/glance-api.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GlanceApiPuppetBase:
     type: ../../puppet/services/glance-api.yaml
     properties:
@@ -68,13 +71,16 @@ outputs:
             privileged: false
             detach: false
             volumes: &glance_volumes
-              - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json
+              yaql:
-              - /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - /lib/modules:/lib/modules:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /dev:/dev
+                    - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json
-              - /etc/hosts:/etc/hosts:ro
+                    - /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro
+                    - /lib/modules:/lib/modules:ro
+                    - /run:/run
+                    - /dev:/dev
             environment:
               - KOLLA_BOOTSTRAP=True
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

docker/services/gnocchi-api.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GnocchiApiPuppetBase:
       type: ../../puppet/services/gnocchi-api.yaml
       properties:
@@ -76,10 +79,13 @@ outputs:
             detach: false
             privileged: false
             volumes:
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - logs:/var/log
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                    - logs:/var/log
             command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"]
         step_4:
           gnocchi_api:
@@ -88,12 +94,15 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro
+                data:
-              - /var/lib/config-data/gnocchi/var/www/:/var/www/:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/hosts:/etc/hosts:ro
+                  service:
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json: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
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/gnocchi-metricd.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GnocchiMetricdBase:
     type: ../../puppet/services/gnocchi-metricd.yaml
     properties:
@@ -65,10 +68,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/gnocchi-metricd.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/gnocchi-metricd.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/gnocchi-statsd.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GnocchiStatsdBase:
     type: ../../puppet/services/gnocchi-statsd.yaml
     properties:
@@ -65,10 +68,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/heat-api-cfn.yaml

@@ -35,6 +35,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   HeatBase:
     type: ../../puppet/services/heat-api-cfn.yaml
     properties:
@@ -77,12 +80,15 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /dev:/dev
+                  service:
-              - /run:/run
+                    - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+                    - /dev:/dev
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/heat-api.yaml

@@ -35,6 +35,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   HeatBase:
     type: ../../puppet/services/heat-api.yaml
     properties:
@@ -77,12 +80,15 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /dev:/dev
+                  service:
-              - /run:/run
+                    - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+                    - /dev:/dev
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/heat-engine.yaml

@@ -30,6 +30,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   HeatBase:
     type: ../../puppet/services/heat-engine.yaml
     properties:
@@ -69,9 +72,12 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
             command: ['heat-manage', 'db_sync']
         step_4:
           heat_engine:
@@ -80,11 +86,14 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
+                    - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/ironic-api.yaml

@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   IronicApiBase:
     type: ../../puppet/services/ironic-api.yaml
     properties:
@@ -74,9 +77,12 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/ironic/etc/:/etc/:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/ironic/etc/:/etc/:ro
             command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf']
         step_4:
           ironic_api:
@@ -86,10 +92,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/ironic/etc/:/etc/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/ironic/etc/:/etc/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/ironic-conductor.yaml

@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   IronicConductorBase:
     type: ../../puppet/services/ironic-conductor.yaml
     properties:
@@ -87,15 +90,18 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /lib/modules:/lib/modules:ro
+                  service:
-              - /sys:/sys
+                    - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
-              - /run:/run #shared?
+                    - /lib/modules:/lib/modules:ro
-              - /var/lib/ironic:/var/lib/ironic
+                    - /sys:/sys
+                    - /dev:/dev
+                    - /run:/run #shared?
+                    - /var/lib/ironic:/var/lib/ironic
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/ironic-pxe.yaml

@@ -31,6 +31,11 @@ parameters:
     default: {}
     type: json
 
+resources:
+
+  ContainersCommon:
+    type: ./containers-common.yaml
+
 outputs:
   role_data:
     description: Role data for the Ironic PXE role.
@@ -65,21 +70,24 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+                expression: $.data.common.concat($.data.service)
-              # TODO(mandre) check how docker like mounting in a bind-mounted tree
+                data:
-              # This directory may contain migrated data from BM
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /var/lib/ironic:/var/lib/ironic/
+                  service:
-              # These files were generated by puppet inside the config container
+                    - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
-              # TODO(mandre) check the mount permission (ro/rw)
+                    - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
-              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
+                    # TODO(mandre) check how docker like mounting in a bind-mounted tree
-              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
+                    # This directory may contain migrated data from BM
-              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/ipxe.efi:/var/lib/ironic/tftpboot/ipxe.efi
+                    - /var/lib/ironic:/var/lib/ironic/
-              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/undionly.kpxe:/var/lib/ironic/tftpboot/undionly.kpxe
+                    # These files were generated by puppet inside the config container
-              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/map-file:/var/lib/ironic/tftpboot/map-file
+                    # TODO(mandre) check the mount permission (ro/rw)
-              - /etc/hosts:/etc/hosts:ro
+                    - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
-              - /dev/log:/dev/log
+                    - /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
+                    - /dev/log:/dev/log
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           ironic_pxe_http:
@@ -89,12 +97,15 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro
+                data:
-              - /etc/hosts:/etc/hosts:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/localtime:/etc/localtime:ro
+                  service:
-              - /var/lib/ironic:/var/lib/ironic/
+                    - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+                    - /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro
+                    - /var/lib/ironic:/var/lib/ironic/
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/keystone.yaml

@@ -42,6 +42,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   KeystoneBase:
     type: ../../puppet/services/keystone.yaml
     properties:
@@ -96,23 +99,26 @@ outputs:
             privileged: false
             detach: false
             volumes: &keystone_volumes
-              - /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/keystone/var/www/:/var/www/:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/keystone/etc/keystone/:/etc/keystone/:ro
+                data:
-              - /var/lib/config-data/keystone/etc/httpd/:/etc/httpd/:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/hosts:/etc/hosts:ro
+                  service:
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro
-              - logs:/var/log
+                    - /var/lib/config-data/keystone/var/www/:/var/www/:ro
-              -
+                    - /var/lib/config-data/keystone/etc/keystone/:/etc/keystone/:ro
-                if:
+                    - /var/lib/config-data/keystone/etc/httpd/:/etc/httpd/:ro
-                  - internal_tls_enabled
+                    - logs:/var/log
-                  - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+                    -
-                  - ''
+                      if:
-              -
+                        - internal_tls_enabled
-                if:
+                        - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
-                  - internal_tls_enabled
+                        - ''
-                  - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                    -
-                  - ''
+                      if:
+                        - internal_tls_enabled
+                        - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                        - ''
             environment:
               - KOLLA_BOOTSTRAP=True
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

docker/services/memcached.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   MemcachedBase:
     type: ../../puppet/services/memcached.yaml
     properties:
@@ -63,9 +66,12 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
             command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS']
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

docker/services/mistral-api.yaml

@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   MistralApiBase:
     type: ../../puppet/services/mistral-api.yaml
     properties:
@@ -75,9 +78,12 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/mistral/etc/:/etc/:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/mistral/etc/:/etc/:ro
             command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'upgrade', 'head']
           mistral_db_populate:
             start_order: 2
@@ -86,9 +92,12 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/mistral/etc/:/etc/:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/mistral/etc/:/etc/:ro
             # 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']
@@ -100,10 +109,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/mistral-engine.yaml

@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   MistralBase:
     type: ../../puppet/services/mistral-engine.yaml
     properties:
@@ -75,11 +78,14 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /run:/run
+              yaql:
-              - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+                data:
-              - /etc/hosts:/etc/hosts:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/localtime:/etc/localtime:ro
+                  service:
+                    - /run:/run
+                    - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/mistral-executor.yaml

@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   MistralBase:
     type: ../../puppet/services/mistral-executor.yaml
     properties:
@@ -75,15 +78,18 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              # FIXME: this is required in order for Nova cells
+                    - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
-              # initialization workflows on the Undercloud. Need to
+                    - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
-              # exclude this on the overcloud for security reasons.
+                    - /run:/run
-              - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
+                    # FIXME: this is required in order for Nova cells
+                    # initialization workflows on the Undercloud. Need to
+                    # exclude this on the overcloud for security reasons.
+                    - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/neutron-api.yaml

@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NeutronBase:
     type: ../../puppet/services/neutron-api.yaml
     properties:
@@ -78,10 +81,13 @@ outputs:
             # and run as neutron user
             user: root
             volumes:
-              - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro
+              yaql:
-              - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro
+                    - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro
             command: ['neutron-db-manage', 'upgrade', 'heads']
         step_4:
           neutron_api:
@@ -90,10 +96,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/neutron-dhcp.yaml

@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NeutronBase:
     type: ../../puppet/services/neutron-dhcp.yaml
     properties:
@@ -76,12 +79,15 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - /etc/hosts:/etc/hosts:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /lib/modules:/lib/modules:ro
+                  service:
-              - /run/:/run
+                    - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                    - /lib/modules:/lib/modules:ro
+                    - /run/:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/neutron-l3.yaml

@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NeutronL3Base:
     type: ../../puppet/services/neutron-l3.yaml
     properties:
@@ -72,10 +75,14 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - /lib/modules:/lib/modules:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
+                    - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                    - /lib/modules:/lib/modules:ro
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

docker/services/neutron-ovs-agent.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NeutronOvsAgentBase:
     type: ../../puppet/services/neutron-ovs-agent.yaml
     properties:
@@ -64,11 +67,15 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - /lib/modules:/lib/modules:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
+                    - /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+                    - /lib/modules:/lib/modules:ro
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/nova-api.yaml

@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaApiBase:
     type: ../../puppet/services/nova-api.yaml
     properties:
@@ -126,10 +129,13 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
         step_5:

docker/services/nova-compute.yaml

@@ -29,6 +29,8 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
 
   NovaComputeBase:
     type: ../../puppet/services/nova-compute.yaml
@@ -66,15 +68,19 @@ outputs:
             user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
+                expression: $.data.common.concat($.data.service)
-              - /dev:/dev
+                data:
-              - /etc/iscsi:/etc/iscsi
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/localtime:/etc/localtime:ro
+                  service:
-              - /lib/modules:/lib/modules:ro
+                    - /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro
-              - /run:/run
+                    - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
-              - /var/lib/nova:/var/lib/nova
+                    - /dev:/dev
-              - /var/lib/libvirt:/var/lib/libvirt
+                    - /etc/iscsi:/etc/iscsi
+                    - /lib/modules:/lib/modules:ro
+                    - /run:/run
+                    - /var/lib/nova:/var/lib/nova
+                    - /var/lib/libvirt:/var/lib/libvirt
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/nova-conductor.yaml

@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaConductorBase:
     type: ../../puppet/services/nova-conductor.yaml
     properties:
@@ -73,11 +76,14 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
+                    - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/nova-ironic.yaml

@@ -33,6 +33,8 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
 
   NovaIronicBase:
     type: ../../puppet/services/nova-ironic.yaml
@@ -70,13 +72,17 @@ outputs:
             user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - /run:/run
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /dev:/dev
+                  service:
-              - /etc/iscsi:/etc/iscsi
+                    - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/nova/:/var/lib/nova
+                    - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                    - /run:/run
+                    - /dev:/dev
+                    - /etc/iscsi:/etc/iscsi
+                    - /var/lib/nova/:/var/lib/nova
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/nova-libvirt.yaml

@@ -35,6 +35,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaLibvirtBase:
     type: ../../puppet/services/nova-libvirt.yaml
     properties:
@@ -73,18 +76,22 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - /lib/modules:/lib/modules:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /dev:/dev
+                  service:
-              - /run:/run
+                    - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
-              - /sys/fs/cgroup:/sys/fs/cgroup
+                    - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
-              - /var/lib/nova:/var/lib/nova
+                    - /lib/modules:/lib/modules:ro
-              # Needed to use host's virtlogd
+                    - /dev:/dev
-              - /var/run/libvirt:/var/run/libvirt
+                    - /run:/run
-              - /var/lib/libvirt:/var/lib/libvirt
+                    - /sys/fs/cgroup:/sys/fs/cgroup
-              - /etc/libvirt/qemu:/etc/libvirt/qemu
+                    - /var/lib/nova:/var/lib/nova
+                    # Needed to use host's virtlogd
+                    - /var/run/libvirt:/var/run/libvirt
+                    - /var/lib/libvirt:/var/lib/libvirt
+                    - /etc/libvirt/qemu:/etc/libvirt/qemu
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/nova-placement.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaPlacementBase:
     type: ../../puppet/services/nova-placement.yaml
     properties:
@@ -70,12 +73,15 @@ outputs:
             user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
+                data:
-              - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/hosts:/etc/hosts:ro
+                  service:
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json: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
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/nova-scheduler.yaml

@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaSchedulerBase:
     type: ../../puppet/services/nova-scheduler.yaml
     properties:
@@ -72,11 +75,14 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
+                    - /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                    - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:

docker/services/panko-api.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   PankoApiPuppetBase:
     type: ../../puppet/services/panko-api.yaml
     properties:
@@ -76,10 +79,13 @@ outputs:
             detach: false
             privileged: false
             volumes:
-              - /var/lib/config-data/panko/etc/panko:/etc/panko:ro
+              yaql:
-              - /etc/hosts:/etc/hosts:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/localtime:/etc/localtime:ro
+                data:
-              - logs:/var/log
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/panko/etc/panko:/etc/panko:ro
+                    - logs:/var/log
             command: /usr/bin/panko-dbsync
         step_4:
           panko_api:
@@ -89,11 +95,14 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/panko/etc/panko/:/etc/panko/:ro
+                expression: $.data.common.concat($.data.service)
-              - /var/lib/config-data/panko/etc/httpd/:/etc/httpd/:ro
+                data:
-              - /var/lib/config-data/panko/var/www/:/var/www/:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/hosts:/etc/hosts:ro
+                  service:
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json: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
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

docker/services/rabbitmq.yaml

@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   RabbitmqBase:
     type: ../../puppet/services/rabbitmq.yaml
     properties:
@@ -69,11 +72,14 @@ outputs:
             net: host
             privileged: false
             volumes:
-              - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /var/lib/rabbitmq:/var/lib/rabbitmq
+                  service:
+                    - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+                    - /var/lib/rabbitmq:/var/lib/rabbitmq
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
               - KOLLA_BOOTSTRAP=True
@@ -95,11 +101,14 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /var/lib/rabbitmq:/var/lib/rabbitmq
+                  service:
+                    - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+                    - /var/lib/rabbitmq:/var/lib/rabbitmq
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/swift-proxy.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   SwiftProxyBase:
     type: ../../puppet/services/swift-proxy.yaml
     properties:
@@ -65,15 +68,18 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
+                expression: $.data.common.concat($.data.service)
-              # at all during runtime?
+                data:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /etc/hosts:/etc/hosts:ro
+                  service:
-              - /etc/localtime:/etc/localtime:ro
+                    - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
-              - /run:/run
+                    # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
-              - /srv/node:/srv/node
+                    # at all during runtime?
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/swift-storage.yaml

@@ -41,6 +41,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   SwiftStorageBase:
     type: ../../puppet/services/swift-storage.yaml
     properties:
@@ -114,13 +117,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: &kolla_env
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           swift_account_reaper:
@@ -129,13 +135,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_account_replicator:
             image: *swift_account_image
@@ -143,13 +152,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_account_server:
             image: *swift_account_image
@@ -157,13 +169,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_container_auditor:
             image: &swift_container_image
@@ -174,13 +189,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_container_replicator:
             image: *swift_container_image
@@ -188,13 +206,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_container_updater:
             image: *swift_container_image
@@ -202,13 +223,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_container_server:
             image: *swift_container_image
@@ -216,13 +240,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_object_auditor:
             image: &swift_object_image
@@ -233,13 +260,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_object_expirer:
             image: *swift_proxy_image
@@ -247,13 +277,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_object_replicator:
             image: *swift_object_image
@@ -261,13 +294,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_object_updater:
             image: *swift_object_image
@@ -275,13 +311,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
           swift_object_server:
             image: *swift_object_image
@@ -289,13 +328,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
-              - /run:/run
+                  service:
-              - /srv/node:/srv/node
+                    - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /dev:/dev
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment: *kolla_env
       host_prep_tasks:
         - name: create /srv/node

docker/services/zaqar.yaml

@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   ZaqarBase:
     type: ../../puppet/services/zaqar.yaml
     properties:
@@ -67,10 +70,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           zaqar_websocket:
@@ -79,10 +85,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
+              yaql:
-              - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
+                expression: $.data.common.concat($.data.service)
-              - /etc/hosts:/etc/hosts:ro
+                data:
-              - /etc/localtime:/etc/localtime:ro
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: