diff options
| author |   marios <marios@redhat.com> | 2016-03-02 18:31:51 +0200 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2016-03-02 18:31:51 +0200 |
| commit | 31b884a2a8749452ebd2923f6a97c5d2bec5aa9d (patch) | |
| tree | 8918f8510b99b83dc192da2b42d4e5a0918058e6 /extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | |
| parent | a54e0b973b296204139d6ff2816902ee96f0b309 (diff) | |
Moves the swift start/stop into the common_functions.sh file
Since swift isn't managed by pacemaker we need to manually (systemctl)
stop and start the swift services. This moves the duplicate blocks for
start/stop into a common function (we already include that
pacemaker_common_functions.sh here so may as well)
Change-Id: Ic4f23212594c1bf9edc39143bf60c7f6d648fd1d
Diffstat (limited to 'extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh')
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh index dcd4be95..bf2ee330 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -30,11 +30,7 @@ if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname) fi # Swift isn't controled by pacemaker -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 stop $S -done +systemctl_swift stop tstart=$(date +%s) while systemctl is-active pacemaker; do |