diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-18 16:49:05 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2018-01-17 13:32:12 -0500 |
| commit | 9a02a7a96d4de691e1f265e88ff4d5ee3f0b7244 (patch) | |
| tree | 5282a31fdb6cc85df5a41dd155001e54b834fb1e /playbooks/common/openshift-cluster/upgrades | |
| parent | da12b2c603eea973466c47b5d6d668ddea6b05fd (diff) | |
| download | openshift-9a02a7a96d4de691e1f265e88ff4d5ee3f0b7244.tar.gz openshift-9a02a7a96d4de691e1f265e88ff4d5ee3f0b7244.tar.bz2 openshift-9a02a7a96d4de691e1f265e88ff4d5ee3f0b7244.tar.xz openshift-9a02a7a96d4de691e1f265e88ff4d5ee3f0b7244.zip | |
Exclude 3.9 packages during 3.8 upgrade
There are some obsoletes in 3.9 packages which lead yum to upgrade
directly from 3.7 to 3.9 when you ask for 3.8 packages while 3.9 repos
are enabled. Since we'd like to allow people to run one playbook to
upgrade from 3.7 to 3.8 to 3.9 we need to exclude those packages when
upgrading to 3.8
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml index 4c1156f4b..45ddf7eea 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml @@ -21,7 +21,7 @@ block: - name: Check latest available OpenShift RPM version repoquery: - name: "{{ openshift_service_type }}" + name: "{{ openshift_service_type }}{{ '-' ~ openshift_release ~ '*' if openshift_release is defined else '' }}" ignore_excluders: true register: repoquery_out diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml index fffae00aa..6235a365d 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml @@ -14,7 +14,7 @@ - import_playbook: ../init.yml vars: l_upgrade_no_switch_firewall_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" - l_upgrade_non_node_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" + when: not skip_version_info | default(false) - name: Configure the upgrade target for the common upgrade tasks hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config |