Merge "Move containers common volumes from yaql to list_concat"

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

diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 374b0be..9c3bfb3 100644 (file)
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Mistral Executor service
@@ -78,18 +78,16 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
-                    - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/: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.
-                    - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/: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.
+                  - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: