aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-20 13:29:51 +0000
committerGerrit Code Review <review@openstack.org>2017-01-20 13:29:51 +0000
commitaecb4e767cf5bcef9743d54fdefcfe1270af9434 (patch)
treed0c45d2e7f54fba4815f5fdb1f59a333888cc3b4
parentf0bed4c7e716d0427018a1246042e4cfec0c9476 (diff)
parent04084ba43f9161d9cf1ec82dc6654e45d0ae4b91 (diff)
Merge "Add swift service support for composable upgrades"
-rw-r--r--puppet/services/swift-proxy.yaml4
-rw-r--r--puppet/services/swift-storage.yaml17
2 files changed, 21 insertions, 0 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index ef7c4c02..62d227a2 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -157,3 +157,7 @@ outputs:
- admin
- swiftoperator
- ResellerAdmin
+ upgrade_tasks:
+ - name: Stop swift_proxy service
+ tags: step2
+ service: name=openstack-swift-proxy state=stopped
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 00ae9c35..08df928d 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -90,3 +90,20 @@ outputs:
swift::storage::all::storage_local_net_ip: {get_param: [ServiceNetMap, SwiftStorageNetwork]}
step_config: |
include ::tripleo::profile::base::swift::storage
+ upgrade_tasks:
+ - name: Stop swift storage services
+ tags: step2
+ service: name={{ item }} state=stopped
+ 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