diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-03-10 15:53:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-10 15:53:20 -0500 |
| commit | 6ac067c925dcf0561340297a4e2407392ecd6805 (patch) | |
| tree | 34ef70311a13b1a831d287737085fa81b2ccf58b | |
| parent | e534d56073d29e4482b336ccac6c7c8b67548b62 (diff) | |
| parent | 37ca540a70756cdbbbc42da78b62c6738eb9259b (diff) | |
| download | openshift-6ac067c925dcf0561340297a4e2407392ecd6805.tar.gz openshift-6ac067c925dcf0561340297a4e2407392ecd6805.tar.bz2 openshift-6ac067c925dcf0561340297a4e2407392ecd6805.tar.xz openshift-6ac067c925dcf0561340297a4e2407392ecd6805.zip | |
Merge pull request #3610 from ingvagabund/re-enable-excluders-during-installation-if-enabled
re-enable excluders if they are enabled after openshift version detection
3 files changed, 14 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml index e4db65b02..86f5a36ca 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml @@ -50,6 +50,8 @@ tags: - pre_upgrade +# Note: During upgrade the openshift excluder is not unexcluded inside the initialize_openshift_version.yml play. +# So it is necassary to run the play after running disable_excluder.yml. - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml tags: - pre_upgrade diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 82f711f40..ff4c4b0d7 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -60,3 +60,7 @@ - include: openshift_hosted.yml tags: - hosted + +- include: reset_excluder.yml + tags: + - always diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 7f37c606f..f8981c040 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -18,12 +18,14 @@ msg: Incompatible versions of yum and subscription-manager found. You may need to update yum and yum-utils. when: "not openshift.common.is_atomic | bool and 'Plugin \"search-disabled-repos\" requires API 2.7. Supported API is 2.6.' in yum_ver_test.stdout" +# TODO(jchaloup): find a different way how to make repoquery --qf '%version` atomic-openshift work without disabling the excluders - include: disable_excluder.yml vars: # the excluders needs to be disabled no matter what status says with_status_check: false tags: - always + when: openshift_upgrade_target is not defined - name: Determine openshift_version to configure on first master hosts: oo_first_master @@ -39,3 +41,9 @@ openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift_version }}" roles: - openshift_version + + # Re-enable excluders if they are meant to be enabled (and only during installation, upgrade disables the excluders before this play) +- include: reset_excluder.yml + tags: + - always + when: openshift_upgrade_target is not defined |