diff options
| author |   Mathieu Bultel <mbultel@redhat.com> | 2016-10-26 11:21:08 +0200 |
|---|---|---|
| committer |   marios <marios@redhat.com> | 2016-10-27 11:38:12 +0300 |
| commit | 61cba946cd11ab3a2d6518663f2300d7c98083de (patch) | |
| tree | 4480c99a943f9fc7c19654ba7d42270a63722261 /extraconfig/tasks/yum_update.sh | |
| parent | ab00d9393b1d1b3a4eceb81135b0e816791e190f (diff) | |
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
Diffstat (limited to 'extraconfig/tasks/yum_update.sh')
| -rwxr-xr-x | extraconfig/tasks/yum_update.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index 4ca0b140..c2d7d58d 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -80,7 +80,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" @@ -88,8 +87,8 @@ if [[ -n $(rpm -q --scripts openvswitch | awk '/postuninstall/,/*/' | grep "syst pushd OVS_UPGRADE echo "Attempting to downloading latest openvswitch with yumdownloader" yumdownloader --resolve openvswitch - echo "Updating openvswitch with nopostun" - rpm -U --nopostun ./*.rpm + echo "Updating openvswitch with nopostun option" + rpm -U --replacepkgs --nopostun ./*.rpm popd else echo "Skipping manual upgrade of openvswitch - no restart in postun detected" |