diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-10 10:22:25 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-10 10:22:25 +0000 |
commit | 1e5ae78ead4f1fb6666d9932aabaade782caa420 (patch) | |
tree | 9b7c76ac1a83349dc2205ffb9e36b3a2e5964241 | |
parent | 91c5c470890f1716e70ca50a72ff7431e6fac08a (diff) | |
parent | 9727a27d00bbc423b565e02d2d69cc3d74f96761 (diff) |
Merge "Fixup systemctl_swift stop/start during the controller upgrade"
-rwxr-xr-x | extraconfig/tasks/pacemaker_common_functions.sh | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh index ee3216e4..0808763e 100755 --- a/extraconfig/tasks/pacemaker_common_functions.sh +++ b/extraconfig/tasks/pacemaker_common_functions.sh @@ -39,10 +39,23 @@ function echo_error { } function systemctl_swift { + services=( 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 openstack-swift-proxy ) action=$1 - for S in 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 openstack-swift-proxy; do - systemctl $action $S + case $action in + stop) + services=$(systemctl | grep swift | grep running | awk '{print $1}') + ;; + start) + enable_swift_storage=$(hiera -c /etc/puppet/hiera.yaml 'enable_swift_storage') + if [[ $enable_swift_storage != "true" ]]; then + services=( openstack-swift-proxy ) + fi + ;; + *) services=() ;; # for safetly, should never happen + esac + for S in ${services[@]}; do + systemctl $action $S done } |