Merge "Fix containerized RabbitMQ service deployment"

[apex-tripleo-heat-templates.git] / docker / services / heat-engine.yaml

diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 83c6309..5a1f011 100644 (file)
--- a/docker/services/heat-engine.yaml
+++ b/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
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                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
-              - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  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: