diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-27 23:44:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 23:44:44 -0500 |
| commit | d12c4dfc223b9e165def963144c80051aba504cc (patch) | |
| tree | 8a9eb5bb50a09e86f67fa79b2bed8b3404a4f498 | |
| parent | a502b675936b617515ae7a00228aa62f1ec5bc53 (diff) | |
| parent | f2b00d09fcea325a6685e5490b86878882d9134f (diff) | |
| download | openshift-d12c4dfc223b9e165def963144c80051aba504cc.tar.gz openshift-d12c4dfc223b9e165def963144c80051aba504cc.tar.bz2 openshift-d12c4dfc223b9e165def963144c80051aba504cc.tar.xz openshift-d12c4dfc223b9e165def963144c80051aba504cc.zip | |
Merge pull request #3737 from dgoodwin/upgrade-pkgs
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml index df2b664d4..03ac02e9f 100644 --- a/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml @@ -1,7 +1,26 @@ --- # We verified latest rpm available is suitable, so just yum update. -- name: Upgrade packages - package: "name={{ openshift.common.service_type }}-{{ component }}{{ openshift_pkg_version }} state=present" + +# Master package upgrade ends up depending on node and sdn packages, we need to be explicit +# with all versions to avoid yum from accidentally jumping to something newer than intended: +- name: Upgrade master packages + package: name={{ item }} state=present + when: component == "master" + with_items: + - "{{ openshift.common.service_type }}{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-master{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-clients{{ openshift_pkg_version }}" + +- name: Upgrade node packages + package: name={{ item }} state=present + when: component == "node" + with_items: + - "{{ openshift.common.service_type }}{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version }}" + - "{{ openshift.common.service_type }}-clients{{ openshift_pkg_version }}" - name: Ensure python-yaml present for config upgrade package: name=PyYAML state=present |