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/nova-ironic.yaml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'docker/services/nova-ironic.yaml')

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 2f4da6c0..3fd71d88 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Nova Ironic Compute service
@@ -72,17 +72,15 @@ outputs:
             user: root
             restart: always
             volumes:
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-                    - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
-                    - /run:/run
-                    - /dev:/dev
-                    - /etc/iscsi:/etc/iscsi
-                    - /var/lib/nova/:/var/lib/nova
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
+                  - /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:
-- 
cgit 1.2.3-korg