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-libvirt.yaml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

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

diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 1f7205ba..1b103df4 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Libvirt Service
@@ -84,22 +84,20 @@ outputs:
             privileged: true
             restart: always
             volumes:
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
-                    - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
-                    - /lib/modules:/lib/modules:ro
-                    - /dev:/dev
-                    - /run:/run
-                    - /sys/fs/cgroup:/sys/fs/cgroup
-                    - /var/lib/nova:/var/lib/nova
-                    # Needed to use host's virtlogd
-                    - /var/run/libvirt:/var/run/libvirt
-                    - /var/lib/libvirt:/var/lib/libvirt
-                    - /etc/libvirt/qemu:/etc/libvirt/qemu
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
+                  - /lib/modules:/lib/modules:ro
+                  - /dev:/dev
+                  - /run:/run
+                  - /sys/fs/cgroup:/sys/fs/cgroup
+                  - /var/lib/nova:/var/lib/nova
+                  # Needed to use host's virtlogd
+                  - /var/run/libvirt:/var/run/libvirt
+                  - /var/lib/libvirt:/var/lib/libvirt
+                  - /etc/libvirt/qemu:/etc/libvirt/qemu
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-- 
cgit 1.2.3-korg