diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-28 16:24:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 16:24:20 -0500 |
| commit | 89f2e49cbe7f61fa8379343552ae9862f926bbfb (patch) | |
| tree | 85c274b5b41cbb3a3ff19024c40173abdff94fcc /playbooks/common/openshift-cluster | |
| parent | d77a9a685c3add9ef9c4d659ee47ebf35e145fe4 (diff) | |
| parent | 7fcc44c894888fd9ed4a5997fd7f82bfc8daf19e (diff) | |
| download | openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.tar.gz openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.tar.bz2 openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.tar.xz openshift-89f2e49cbe7f61fa8379343552ae9862f926bbfb.zip | |
Merge pull request #3781 from ingvagabund/make-the-ocp-version-detection-excluder-free
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_version.yml | 22 |
2 files changed, 0 insertions, 25 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index ff4c4b0d7..1b967b7f1 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -27,9 +27,6 @@ when: openshift_docker_selinux_enabled is not defined - include: disable_excluder.yml - vars: - # the excluders needs to be disabled no matter what status says - with_status_check: false tags: - always diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 1f74e929f..07b38920f 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -18,18 +18,6 @@ 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 - # Only openshift excluder needs to be temporarily disabled - # So ignore the docker one - enable_docker_excluder: false - tags: - - always - when: openshift_upgrade_target is not defined - - name: Determine openshift_version to configure on first master hosts: oo_first_master roles: @@ -44,13 +32,3 @@ 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 - vars: - # Only openshift excluder needs to be re-enabled - # So ignore the docker one - enable_docker_excluder: false - tags: - - always - when: openshift_upgrade_target is not defined |