X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fswift-storage.yaml;h=f9c3cbae976b21ab035da78da4eb178af5c02a50;hb=92535b10ecd1c7436aa95965acf0c12cf8ca9457;hp=247b23fffd9389e8cbd426d52555b3b5da010e91;hpb=7b02ad73fba02689322342e24325cbe04cab637e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 247b23ff..f9c3cbae 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Swift Storage service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -13,6 +17,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -52,9 +64,12 @@ resources:
   SwiftBase:
     type: ./swift-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 conditions:
   swift_mount_check:
@@ -103,7 +118,7 @@ outputs:
         include ::tripleo::profile::base::swift::storage
       upgrade_tasks:
         - name: Stop swift storage services
-          tags: step2
+          tags: step1
           service: name={{ item }} state=stopped
           with_items:
             - openstack-swift-account-auditor
@@ -115,6 +130,7 @@ outputs:
             - openstack-swift-container-updater
             - openstack-swift-container
             - openstack-swift-object-auditor
+            - openstack-swift-object-expirer
             - openstack-swift-object-replicator
             - openstack-swift-object-updater
             - openstack-swift-object