diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-09 08:42:13 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-09 08:42:13 -0500 |
| commit | a13d9b9ae01ab73c85d1ebcf98167cf70e85b974 (patch) | |
| tree | d6bd28ab0ebbfcfffc935763fa0aa940fbff6f61 /playbooks/common/openshift-cluster/upgrades | |
| parent | a87dfdd698f251d3892ef98f189b9f08539039f5 (diff) | |
| parent | 79dbcc69c8574ffbe3dc5c6fb98129e365cf63cb (diff) | |
| download | openshift-a13d9b9ae01ab73c85d1ebcf98167cf70e85b974.tar.gz openshift-a13d9b9ae01ab73c85d1ebcf98167cf70e85b974.tar.bz2 openshift-a13d9b9ae01ab73c85d1ebcf98167cf70e85b974.tar.xz openshift-a13d9b9ae01ab73c85d1ebcf98167cf70e85b974.zip | |
Merge pull request #1334 from brenton/bz1304150
Bug 1304150 - Can't upgrade atomic-openshift to specified version
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 8ec379109..55c36810f 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -229,12 +229,19 @@ hosts: oo_masters_to_config vars: openshift_version: "{{ openshift_pkg_version | default('') }}" + roles: + - openshift_facts tasks: - name: Upgrade to latest available kernel action: "{{ ansible_pkg_mgr}} name=kernel state=latest" - name: Upgrade master packages command: "{{ ansible_pkg_mgr}} update -y {{ openshift.common.service_type }}-master{{ openshift_version }}" + when: openshift_pkg_version is not defined + + - name: Upgrade packages + command: "{{ ansible_pkg_mgr}} install -y {{ openshift.common.installed_variant_rpms | oo_31_rpm_rename_conversion(openshift_version) | join (' ')}}" + when: openshift_pkg_version is defined and deployment_type == 'openshift-enterprise' - name: Ensure python-yaml present for config upgrade action: "{{ ansible_pkg_mgr }} name=PyYAML state=present" @@ -415,6 +422,11 @@ tasks: - name: Upgrade node packages command: "{{ ansible_pkg_mgr }} update -y {{ openshift.common.service_type }}-node{{ openshift_version }}" + when: openshift_pkg_version is not defined + + - name: Upgrade packages + command: "{{ ansible_pkg_mgr}} install -y {{ openshift.common.installed_variant_rpms | oo_31_rpm_rename_conversion(openshift_version) | join (' ')}}" + when: openshift_pkg_version is defined and deployment_type == 'openshift-enterprise' - name: Restart node service service: name="{{ openshift.common.service_type }}-node" state=restarted |