aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-26 13:13:47 +0000
committerGerrit Code Review <review@openstack.org>2017-07-26 13:13:47 +0000
commit95a6da61129ec6a88836f99c8f2d0260a53bba96 (patch)
tree16f393d26ca62a5c73766b6b61a0b6a4e33bdcf8
parent4c05db369cb44bc10fd3c6a131af5badcdfd351b (diff)
parent11b2546966580b1c4f0943a881239194a030cf19 (diff)
Merge "Stop also openstack-swift-object-expirer when upgrading swift services"
-rw-r--r--docker/services/swift-storage.yaml1
-rw-r--r--puppet/services/swift-storage.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 04e58b4a..e879b25d 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -462,6 +462,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
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 40bc1368..f9c3cbae 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -130,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