Code Review / apex-tripleo-heat-templates.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Add initial support for NSX plugin"
[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 1b89827..5044c54 100644 (file)
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -41,6 +41,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   SwiftStorageBase:
     type: ../../puppet/services/swift-storage.yaml
     properties:
@@ -104,9 +107,9 @@ outputs:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
             user: root
-            command: ['/bin/bash', '-c', 'mkdir /srv/node && chown swift:swift /srv/node']
+            command: ['chown', '-R', 'swift:', '/srv/node']
             volumes:
-              - swift-srv:/srv
+              - /srv/node:/srv/node
         step_4:
           swift_account_auditor:
             image: *swift_account_image
@@ -114,14 +117,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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:
@@ -130,14 +135,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -145,14 +152,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -160,14 +169,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -178,14 +189,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -193,14 +206,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -208,14 +223,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -223,14 +240,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -241,14 +260,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -256,14 +277,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -271,14 +294,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -286,14 +311,16 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
@@ -301,15 +328,22 @@ 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/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - swift-srv:/srv
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /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
+          file:
+            path: /srv/node
+            state: directory
       upgrade_tasks:
         - name: Stop and disable swift storage services
           tags: step2