Add replacepkgs to the manual ovs upgrade workaround and fix a typo
rpm command will return an exit 1 if ovs package is already there and will exit the step_1.sh script. To get around this force the update with --replacepkgs Also remove the \ just before the $ which cause a syntax error for the ceph storage Change-Id: I11fcf688982ceda5eef7afc8904afae44300c2d9 Closes-bug: 1636748
This commit is contained in:
parent
ab00d9393b
commit
61cba946cd
@ -11,8 +11,8 @@ if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "syst
|
|||||||
pushd OVS_UPGRADE
|
pushd OVS_UPGRADE
|
||||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||||
yumdownloader --resolve openvswitch
|
yumdownloader --resolve openvswitch
|
||||||
echo "Updating openvswitch with nopostun"
|
echo "Updating openvswitch with nopostun option"
|
||||||
rpm -U --nopostun ./*.rpm
|
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||||
|
@ -50,14 +50,14 @@ timeout 60 bash -c "while kill -0 ${OSD_PIDS} 2> /dev/null; do
|
|||||||
done"
|
done"
|
||||||
|
|
||||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||||
if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||||
mkdir OVS_UPGRADE || true
|
mkdir OVS_UPGRADE || true
|
||||||
pushd OVS_UPGRADE
|
pushd OVS_UPGRADE
|
||||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||||
yumdownloader --resolve openvswitch
|
yumdownloader --resolve openvswitch
|
||||||
echo "Updating openvswitch with nopostun"
|
echo "Updating openvswitch with nopostun option"
|
||||||
rpm -U --nopostun ./*.rpm
|
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||||
|
@ -18,7 +18,6 @@ set -eu
|
|||||||
|
|
||||||
crudini --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute
|
crudini --set /etc/nova/nova.conf upgrade_levels compute $upgrade_level_nova_compute
|
||||||
|
|
||||||
|
|
||||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||||
if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||||
@ -26,8 +25,8 @@ if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "sys
|
|||||||
pushd OVS_UPGRADE
|
pushd OVS_UPGRADE
|
||||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||||
yumdownloader --resolve openvswitch
|
yumdownloader --resolve openvswitch
|
||||||
echo "Updating openvswitch with nopostun"
|
echo "Updating openvswitch with nopostun option"
|
||||||
rpm -U --nopostun ./*.rpm
|
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||||
|
@ -122,7 +122,6 @@ if [ $DO_MYSQL_UPGRADE -eq 1 ]; then
|
|||||||
mv /var/lib/mysql $MYSQL_TEMP_UPGRADE_BACKUP_DIR
|
mv /var/lib/mysql $MYSQL_TEMP_UPGRADE_BACKUP_DIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||||
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||||
@ -130,8 +129,8 @@ if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "syst
|
|||||||
pushd OVS_UPGRADE
|
pushd OVS_UPGRADE
|
||||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||||
yumdownloader --resolve openvswitch
|
yumdownloader --resolve openvswitch
|
||||||
echo "Updating openvswitch with nopostun"
|
echo "Updating openvswitch with nopostun option"
|
||||||
rpm -U --nopostun ./*.rpm
|
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||||
|
@ -30,8 +30,8 @@ if [[ -n \$(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "sys
|
|||||||
pushd OVS_UPGRADE
|
pushd OVS_UPGRADE
|
||||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||||
yumdownloader --resolve openvswitch
|
yumdownloader --resolve openvswitch
|
||||||
echo "Updating openvswitch with nopostun"
|
echo "Updating openvswitch with nopostun option"
|
||||||
rpm -U --nopostun ./*.rpm
|
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||||
|
@ -80,7 +80,6 @@ else
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
# Special-case OVS for https://bugs.launchpad.net/tripleo/+bug/1635205
|
||||||
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "systemctl.*try-restart") ]]; then
|
||||||
echo "Manual upgrade of openvswitch - restart in postun detected"
|
echo "Manual upgrade of openvswitch - restart in postun detected"
|
||||||
@ -88,8 +87,8 @@ if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "syst
|
|||||||
pushd OVS_UPGRADE
|
pushd OVS_UPGRADE
|
||||||
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
echo "Attempting to downloading latest openvswitch with yumdownloader"
|
||||||
yumdownloader --resolve openvswitch
|
yumdownloader --resolve openvswitch
|
||||||
echo "Updating openvswitch with nopostun"
|
echo "Updating openvswitch with nopostun option"
|
||||||
rpm -U --nopostun ./*.rpm
|
rpm -U --replacepkgs --nopostun ./*.rpm
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
echo "Skipping manual upgrade of openvswitch - no restart in postun detected"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user