Merge "pacemaker remote profile support"

[apex-tripleo-heat-templates.git] / puppet / services / swift-proxy.yaml

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 94db9e4..62d227a 100644 (file)
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   OpenStack Swift Proxy service configured with Puppet
@@ -119,8 +119,8 @@ outputs:
                   - 'keystone'
                   - 'staticweb'
                   - 'copy'
-                  - 'container-quotas'
-                  - 'account-quotas'
+                  - 'container_quotas'
+                  - 'account_quotas'
                   - 'slo'
                   - 'dlo'
                   - 'versioned_writes'
@@ -157,3 +157,7 @@ outputs:
             - admin
             - swiftoperator
             - ResellerAdmin
+      upgrade_tasks:
+        - name: Stop swift_proxy service
+          tags: step2
+          service: name=openstack-swift-proxy state=stopped