Add special case upgrade from openvswitch 2.5.0-14
In [1] we removed the previously used special case upgrade code.
However we have since discovered that for openvswitch 2.5.0-14
the special case is still required with an extra flag to prevent
the restart. This adds the upgrade code back into the minor
update and 'manual upgrade' scripts for compute/swift. The
review at If998704b3c4199bbae8a1d068c31a71763f5c8a2 is adding
this logic for the ansible upgrade steps.
Related-Bug: 1669714
[1] https://review.openstack.org/#/q/59e5f9597eb37f69045e470eb457b878728477d7
Change-Id: I3e5899e2d831b89745b2f37e61ff69dbf83ff595
(cherry picked from commit 25983882c2
)
This commit is contained in:
parent
4a7c484c02
commit
2e7c850fa1
|
@ -299,9 +299,10 @@ function systemctl_swift {
|
|||
}
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
# Update condition and add --notriggerun for +bug/1669714
|
||||
function special_case_ovs_upgrade_if_needed {
|
||||
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
if rpm -qa | grep "^openvswitch-2.5.0-14" || rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart" ; then
|
||||
echo "Manual upgrade of openvswitch - ovs-2.5.0-14 or restart in postun detected"
|
||||
rm -rf OVS_UPGRADE
|
||||
mkdir OVS_UPGRADE && pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
|
@ -310,8 +311,8 @@ function special_case_ovs_upgrade_if_needed {
|
|||
if rpm -U --test $pkg 2>&1 | grep "already installed" ; then
|
||||
echo "Looks like newer version of $pkg is already installed, skipping"
|
||||
else
|
||||
echo "Updating $pkg with nopostun option"
|
||||
rpm -U --replacepkgs --nopostun $pkg
|
||||
echo "Updating $pkg with --nopostun --notriggerun"
|
||||
rpm -U --replacepkgs --nopostun --notriggerun $pkg
|
||||
fi
|
||||
done
|
||||
popd
|
||||
|
|
|
@ -28,12 +28,15 @@ SCRIPT_NAME=$(basename $0)
|
|||
$(declare -f log_debug)
|
||||
$(declare -f manage_systemd_service)
|
||||
$(declare -f systemctl_swift)
|
||||
$(declare -f special_case_ovs_upgrade_if_needed)
|
||||
|
||||
# pin nova messaging +-1 for the nova-compute service
|
||||
if [[ -n \$NOVA_COMPUTE ]]; then
|
||||
crudini --set /etc/nova/nova.conf upgrade_levels compute auto
|
||||
fi
|
||||
|
||||
special_case_ovs_upgrade_if_needed
|
||||
|
||||
if [[ -n \$SWIFT_STORAGE ]]; then
|
||||
systemctl_swift stop
|
||||
fi
|
||||
|
|
|
@ -70,6 +70,9 @@ if [[ "$pacemaker_status" == "active" && \
|
|||
fi
|
||||
fi
|
||||
|
||||
# special case https://bugs.launchpad.net/tripleo/+bug/1635205 +bug/1669714
|
||||
special_case_ovs_upgrade_if_needed
|
||||
|
||||
if [[ "$pacemaker_status" == "active" ]] ; then
|
||||
echo "Pacemaker running, stopping cluster node and doing full package update"
|
||||
node_count=$(pcs status xml | grep -o "<nodes_configured.*/>" | grep -o 'number="[0-9]*"' | grep -o "[0-9]*")
|
||||
|
|
Loading…
Reference in New Issue