Move containers common volumes from yaql to list_concat

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

diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index 0b4f81e..7f4ee43 100644 (file)
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Glance service configured with Puppet
@@ -71,16 +71,14 @@ outputs:
             privileged: false
             detach: false
             volumes: &glance_volumes
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /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
-                    - /lib/modules:/lib/modules:ro
-                    - /run:/run
-                    - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, 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
+                  - /lib/modules:/lib/modules:ro
+                  - /run:/run
+                  - /dev:/dev
             environment:
               - KOLLA_BOOTSTRAP=True
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS