diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-18 11:51:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-18 11:51:07 +0000 |
| commit | a89fb921a1a8948241ca17ed1b92564725eb636a (patch) | |
| tree | abb10db10a409fe9b067aa0df9f71fa00ce3dffd | |
| parent | e57a7cdd733c5edd974749cd21e0563c8c6ca9fa (diff) | |
| parent | 1a544f66a51579180ead9deadc168d2a1a200719 (diff) | |
Merge "Ensure yum cache is ready before update"
| -rwxr-xr-x | extraconfig/tasks/yum_update.sh | 3 | ||||
| -rw-r--r-- | puppet/services/openvswitch.yaml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index 8f804583..a2a04e8e 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -64,6 +64,9 @@ fi command_arguments=${command_arguments:-} +# Always ensure yum has full cache +yum makecache || echo "Yum makecache failed. This can cause failure later on." + # yum check-update exits 100 if updates are available set +e check_update=$(yum check-update 2>&1) diff --git a/puppet/services/openvswitch.yaml b/puppet/services/openvswitch.yaml index 0edd1139..d8061d4b 100644 --- a/puppet/services/openvswitch.yaml +++ b/puppet/services/openvswitch.yaml @@ -163,6 +163,8 @@ outputs: owner: root group: root mode: 0750 + - name: Make yum cache. + command: yum makecache - name: Download OVS packages. command: yumdownloader --destdir /root/OVS_UPGRADE --resolve openvswitch - name: Get rpm list for manual upgrade of OVS. |