From c7471e7503a61ed6895ac6ce92ca48afd225343b Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Tue, 25 Apr 2017 10:55:25 +0300
Subject: Move containers common volumes from yaql to list_concat

list_concat was introduced recently and is able to replace the yaql
calls for concatenating lists.

Change-Id: Id3a80a0e1e4c25b6d838898757c69ec99d0cd826
---
 docker/services/aodh-api.yaml | 52 ++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

(limited to 'docker/services/aodh-api.yaml')

diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 9480ce84..b93a92e1 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized aodh service
@@ -86,13 +86,11 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
-                    - logs:/var/log
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                  - logs:/var/log
             command: /usr/bin/aodh-dbsync
         step_4:
           aodh_api:
@@ -101,26 +99,24 @@ 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/aodh-api.json:/var/lib/kolla/config_files/config.json: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
-                    - logs:/var/log
-                    -
-                      if:
-                        - internal_tls_enabled
-                        - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
-                        - ''
-                    -
-                      if:
-                        - internal_tls_enabled
-                        - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
-                        - ''
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json: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
+                  - logs:/var/log
+                  -
+                    if:
+                      - internal_tls_enabled
+                      - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+                      - ''
+                  -
+                    if:
+                      - internal_tls_enabled
+                      - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                      - ''
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
-- 
cgit 1.2.3-korg