Move containers common volumes from yaql to list_concat

[apex-tripleo-heat-templates.git] / docker / services / swift-storage.yaml

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index cccddb4..b4a6a94 100644 (file)
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Swift Storage services.
@@ -41,6 +41,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   SwiftStorageBase:
     type: ../../puppet/services/swift-storage.yaml
     properties:
@@ -114,13 +117,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: &kolla_env
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           swift_account_reaper:
@@ -129,13 +133,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_account_replicator:
             image: *swift_account_image
@@ -143,13 +148,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_account_server:
             image: *swift_account_image
@@ -157,13 +163,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_container_auditor:
             image: &swift_container_image
@@ -174,13 +181,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_container_replicator:
             image: *swift_container_image
@@ -188,13 +196,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_container_updater:
             image: *swift_container_image
@@ -202,13 +211,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_container_server:
             image: *swift_container_image
@@ -216,13 +226,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_object_auditor:
             image: &swift_object_image
@@ -233,13 +244,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_object_expirer:
             image: *swift_proxy_image
@@ -247,13 +259,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_object_replicator:
             image: *swift_object_image
@@ -261,13 +274,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_object_updater:
             image: *swift_object_image
@@ -275,13 +289,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
           swift_object_server:
             image: *swift_object_image
@@ -289,13 +304,14 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment: *kolla_env
       host_prep_tasks:
         - name: create /srv/node