Add special case handling for OVS upgrade in updates and upgrades
This adds a special case handling for the opensvswitch package as discussed at the related bug below. This is added/handled here for both the minor update and the major mitaka...newton upgrade. Change-Id: I9b1f0eaa0d36a28e20b507bec6a4e9b3af1781ae Closes-Bug: 1635205
This commit is contained in:
parent
01452606a4
commit
7e09b70bc3
@ -4,5 +4,19 @@
|
||||
#
|
||||
set -eu
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
mkdir OVS_UPGRADE || true
|
||||
pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
yumdownloader --resolve openvswitch
|
||||
echo "Updating openvswitch with nopostun"
|
||||
rpm -U --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
yum -y install python-zaqarclient # needed for os-collect-config
|
||||
yum -y -q update
|
||||
|
@ -49,6 +49,20 @@ timeout 60 bash -c "while kill -0 ${OSD_PIDS} 2> /dev/null; do
|
||||
sleep 2;
|
||||
done"
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
mkdir OVS_UPGRADE || true
|
||||
pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
yumdownloader --resolve openvswitch
|
||||
echo "Updating openvswitch with nopostun"
|
||||
rpm -U --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
# Update (Ceph to Jewel)
|
||||
yum -y install python-zaqarclient # needed for os-collect-config
|
||||
yum -y update
|
||||
|
@ -18,6 +18,21 @@ set -eu
|
||||
|
||||
crudini --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute
|
||||
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
mkdir OVS_UPGRADE || true
|
||||
pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
yumdownloader --resolve openvswitch
|
||||
echo "Updating openvswitch with nopostun"
|
||||
rpm -U --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
yum -y install python-zaqarclient # needed for os-collect-config
|
||||
yum -y update
|
||||
|
||||
|
@ -120,6 +120,21 @@ if [ $DO_MYSQL_UPGRADE -eq 1 ]; then
|
||||
mv /var/lib/mysql $MYSQL_TEMP_UPGRADE_BACKUP_DIR
|
||||
fi
|
||||
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
mkdir OVS_UPGRADE || true
|
||||
pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
yumdownloader --resolve openvswitch
|
||||
echo "Updating openvswitch with nopostun"
|
||||
rpm -U --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
yum -y install python-zaqarclient # needed for os-collect-config
|
||||
yum -y -q update
|
||||
|
||||
|
@ -23,6 +23,19 @@ function systemctl_swift {
|
||||
done
|
||||
}
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
mkdir OVS_UPGRADE || true
|
||||
pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
yumdownloader --resolve openvswitch
|
||||
echo "Updating openvswitch with nopostun"
|
||||
rpm -U --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
systemctl_swift stop
|
||||
|
||||
|
@ -61,6 +61,21 @@ else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||
mkdir OVS_UPGRADE || true
|
||||
pushd OVS_UPGRADE
|
||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||
yumdownloader --resolve openvswitch
|
||||
echo "Updating openvswitch with nopostun"
|
||||
rpm -U --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
command=${command:-update}
|
||||
full_command="yum -q -y $command $command_arguments"
|
||||
echo "Running: $full_command"
|
||||
|
Loading…
Reference in New Issue
Block a user