Merge "Fix ovs 2.4 to 2.5 upgrade - minor update non controllers"
This commit is contained in:
commit
539fc9de07
@ -62,6 +62,19 @@ if [[ "$pacemaker_status" == "active" && \
|
||||
fi
|
||||
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 option"
|
||||
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||
popd
|
||||
else
|
||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||
fi
|
||||
|
||||
if [[ "$pacemaker_status" == "active" ]] ; then
|
||||
echo "Pacemaker running, stopping cluster node and doing full package update"
|
||||
@ -81,20 +94,6 @@ 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 option"
|
||||
rpm -U --replacepkgs --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…
x
Reference in New Issue
Block a user