diff options
| author |   marios <marios@redhat.com> | 2016-11-18 19:18:54 +0200 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2016-12-14 19:15:11 +0200 |
| commit | afcb6e01f3af573a7bdd286a65b71eee48cec204 (patch) | |
| tree | af41a22fec0bf19f3829afaa5dd20ccdc02c1fd3 /extraconfig/tasks/yum_update.yaml | |
| parent | 326fb47bfa3b26d191152cd659d76051faf771e3 (diff) | |
Make the openvswitch 2.4->2.5 upgrade more robust
In I9b1f0eaa0d36a28e20b507bec6a4e9b3af1781ae and
I11fcf688982ceda5eef7afc8904afae44300c2d9 we added a manual step
for upgrading openvswitch in order to specify the --nopostun
as discussed in the bug below.
This change adds a minor update to make this workaround more
robust. It removes any existing rpms that may be around from
an earlier run, and also checks that the rpms installed are
at least newer than the version we are on.
This also refactors the code into a common definition in the
pacemaker_common_functions.sh which is included even for the
heredocs generating upgrade scripts during init. Thanks
Sofer Athlan-Guyot and Jirka Stransky for help with that.
Change-Id: Idc863de7b5a8c116c990ee8c1472cfe377836d37
Related-Bug: 1635205
Diffstat (limited to 'extraconfig/tasks/yum_update.yaml')
| -rw-r--r-- | extraconfig/tasks/yum_update.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extraconfig/tasks/yum_update.yaml b/extraconfig/tasks/yum_update.yaml index d313ca9f..f2de5acf 100644 --- a/extraconfig/tasks/yum_update.yaml +++ b/extraconfig/tasks/yum_update.yaml @@ -9,7 +9,12 @@ resources: type: OS::Heat::SoftwareConfig properties: group: script - config: {get_file: yum_update.sh} + config: + list_join: + - '' + - - get_file: pacemaker_common_functions.sh + - get_file: yum_update.sh + inputs: - name: update_identifier description: yum will only run for previously unused values of update_identifier |