afcb6e01f3
In I9b1f0eaa0d36a28e20b507bec6a4e9b3af1781ae and I11fcf688982ceda5eef7afc8904afae44300c2d9 we added a manual step for upgrading openvswitch in order to specify the --nopostun as discussed in the bug below. This change adds a minor update to make this workaround more robust. It removes any existing rpms that may be around from an earlier run, and also checks that the rpms installed are at least newer than the version we are on. This also refactors the code into a common definition in the pacemaker_common_functions.sh which is included even for the heredocs generating upgrade scripts during init. Thanks Sofer Athlan-Guyot and Jirka Stransky for help with that. Change-Id: Idc863de7b5a8c116c990ee8c1472cfe377836d37 Related-Bug: 1635205
43 lines
1.1 KiB
Bash
43 lines
1.1 KiB
Bash
#!/bin/bash
|
|
#
|
|
# This delivers the swift-storage upgrade script to be invoked as part of the tripleo
|
|
# major upgrade workflow.
|
|
#
|
|
set -eu
|
|
|
|
UPGRADE_SCRIPT=/root/tripleo_upgrade_node.sh
|
|
|
|
cat > $UPGRADE_SCRIPT << ENDOFCAT
|
|
### DO NOT MODIFY THIS FILE
|
|
### This file is automatically delivered to the swift-storage nodes as part of the
|
|
### tripleo upgrades workflow
|
|
|
|
set -eu
|
|
|
|
function systemctl_swift {
|
|
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; do
|
|
systemctl \$action \$S
|
|
done
|
|
}
|
|
|
|
$(declare -f special_case_ovs_upgrade_if_needed)
|
|
special_case_ovs_upgrade_if_needed
|
|
|
|
systemctl_swift stop
|
|
|
|
yum -y install python-zaqarclient # needed for os-collect-config
|
|
yum -y update
|
|
|
|
systemctl_swift start
|
|
|
|
|
|
|
|
ENDOFCAT
|
|
|
|
# ensure the permissions are OK
|
|
chmod 0755 $UPGRADE_SCRIPT
|
|
|