X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fswift-storage.yaml;h=301ef69b7afed1d8783d636c1ef2a8d9d6069883;hb=82db6ab608b29e455fb2036aeb36537148b97cf9;hp=5b2ec6e699f35258b2accb9bbdd7a4aadc55b786;hpb=8bd9652ca23019c95c4c8360592e9acf4b89fe86;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 5b2ec6e6..301ef69b 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -54,16 +54,18 @@ outputs:
     value:
       service_name: {get_attr: [SwiftStorageBase, role_data, service_name]}
       config_settings: {get_attr: [SwiftStorageBase, role_data, config_settings]}
-      step_config: {get_attr: [SwiftStorageBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [SwiftStorageBase, role_data, step_config]
       service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &swift_proxy_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
-      puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
-      config_volume: swift
-      config_image: *swift_proxy_image
+      puppet_config:
+        config_volume: swift
+        puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
+        step_config: *step_config
+        config_image: &swift_proxy_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
       kolla_config:
         /var/lib/kolla/config_files/swift_account_auditor.json:
           command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf
@@ -97,20 +99,17 @@ outputs:
           # volume during the configuration stage.  We just need to create this
           # directory and make sure it's owned by swift.
           swift_setup_srv:
-            image:
+            image: &swift_account_image
               list_join:
                 - '/'
                 - [ {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:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -121,15 +120,12 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: &kolla_env
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           swift_account_reaper:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -140,14 +136,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_account_replicator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -158,14 +151,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_account_server:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -176,11 +166,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_container_auditor:
-            image:
+            image: &swift_container_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
@@ -194,14 +184,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_container_replicator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: *swift_container_image
             net: host
             user: swift
             restart: always
@@ -212,14 +199,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_container_updater:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: *swift_container_image
             net: host
             user: swift
             restart: always
@@ -230,14 +214,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_container_server:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: *swift_container_image
             net: host
             user: swift
             restart: always
@@ -248,11 +229,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_object_auditor:
-            image:
+            image: &swift_object_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
@@ -266,14 +247,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_object_expirer:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+            image: *swift_proxy_image
             net: host
             user: swift
             restart: always
@@ -284,14 +262,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_object_replicator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: *swift_object_image
             net: host
             user: swift
             restart: always
@@ -302,14 +277,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_object_updater:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: *swift_object_image
             net: host
             user: swift
             restart: always
@@ -320,14 +292,11 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /srv/node:/srv/node
               - /dev:/dev
             environment: *kolla_env
           swift_object_server:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: *swift_object_image
             net: host
             user: swift
             restart: always
@@ -338,6 +307,28 @@ outputs:
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
-              - swift-srv:/srv
+              - /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
+          service: name={{ item }} state=stopped enabled=no
+          with_items:
+            - openstack-swift-account-auditor
+            - openstack-swift-account-reaper
+            - openstack-swift-account-replicator
+            - openstack-swift-account
+            - openstack-swift-container-auditor
+            - openstack-swift-container-replicator
+            - openstack-swift-container-updater
+            - openstack-swift-container
+            - openstack-swift-object-auditor
+            - openstack-swift-object-replicator
+            - openstack-swift-object-updater
+            - openstack-swift-object