diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-17 13:32:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 13:32:27 -0500 |
| commit | b58e8c1136725db9ce11d01e01e42575ee25ab44 (patch) | |
| tree | c8baaf478cb96b21ed769be545be8de6cccc39c5 /roles/openshift_master | |
| parent | 2e1a1328457315c0d434d5a0fe1660e07512f6bd (diff) | |
| parent | dd9a27ad1448b2c953b0b45a46dba83f77cc5ad5 (diff) | |
| download | openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.tar.gz openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.tar.bz2 openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.tar.xz openshift-b58e8c1136725db9ce11d01e01e42575ee25ab44.zip | |
Merge pull request #6520 from sdodson/37-38-39
Faciliate 3.7 to 3.8 to 3.9 upgrade
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/upgrade/rpm_upgrade.yml | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml b/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml index 96079884e..4564f33dd 100644 --- a/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml +++ b/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml @@ -8,8 +8,10 @@ # TODO: If the sdn package isn't already installed this will install it, we # should fix that -- name: Upgrade master packages - package: name={{ master_pkgs | join(',') }} state=present +- name: Upgrade master packages - yum + command: + yum install -y {{ master_pkgs | join(' ') }} \ + {{ ' --exclude *' ~ openshift_service_type ~ '*3.9*' if openshift_release | version_compare('3.9','<') else '' }} vars: master_pkgs: - "{{ openshift_service_type }}{{ openshift_pkg_version | default('') }}" @@ -19,3 +21,19 @@ - "{{ openshift_service_type }}-clients{{ openshift_pkg_version | default('') }}" register: result until: result is succeeded + when: ansible_pkg_mgr == 'yum' + +- name: Upgrade master packages - dnf + dnf: + name: "{{ master_pkgs | join(',') }}" + state: present + vars: + master_pkgs: + - "{{ openshift_service_type }}{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}-master{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}-sdn-ovs{{ openshift_pkg_version }}" + - "{{ openshift_service_type }}-clients{{ openshift_pkg_version }}" + register: result + until: result is succeeded + when: ansible_pkg_mgr == 'dnf' |