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/swift-proxy.yaml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'docker/services/swift-proxy.yaml')

diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 6e8d6eb9..8ea42222 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized swift proxy service
@@ -68,18 +68,16 @@ outputs:
             user: swift
             restart: always
             volumes:
-              yaql:
-                expression: $.data.common.concat($.data.service)
-                data:
-                  common: {get_attr: [ContainersCommon, volumes]}
-                  service:
-                    - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
-                    # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
-                    # at all during runtime?
-                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-                    - /run:/run
-                    - /srv/node:/srv/node
-                    - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
+                  # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
+                  # at all during runtime?
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-- 
cgit 1.2.3-korg