summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-04-21 09:01:17 -0400
committerGitHub <noreply@github.com>2017-04-21 09:01:17 -0400
commit1531e6db45e71926bbf0a09d52d3e8dd976db719 (patch)
tree1304c5f693578adb3d3c798debbcf7e814474cc6
parent307bc9465fb3d0dbe224dc016996f8abfb73b0b4 (diff)
parentcec20af6b3c11e7b45420a372f640372298db2be (diff)
downloadopenshift-1531e6db45e71926bbf0a09d52d3e8dd976db719.tar.gz
openshift-1531e6db45e71926bbf0a09d52d3e8dd976db719.tar.bz2
openshift-1531e6db45e71926bbf0a09d52d3e8dd976db719.tar.xz
openshift-1531e6db45e71926bbf0a09d52d3e8dd976db719.zip
Merge pull request #3966 from sdodson/dont-check-disabled-excluders
Don't check excluder versions when they're not enabled
-rw-r--r--playbooks/common/openshift-cluster/upgrades/disable_excluder.yml13
1 files changed, 7 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml b/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml
index d1e431c5e..a30952929 100644
--- a/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml
+++ b/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml
@@ -5,12 +5,13 @@
tasks:
- include: pre/validate_excluder.yml
vars:
- #repoquery_cmd: repoquery_cmd
- #openshift_upgrade_target: openshift_upgrade_target
- excluder: "{{ item }}"
- with_items:
- - "{{ openshift.common.service_type }}-docker-excluder"
- - "{{ openshift.common.service_type }}-excluder"
+ excluder: "{{ openshift.common.service_type }}-docker-excluder"
+ when: enable_docker_excluder | default(enable_excluders) | default(True) | bool
+ - include: pre/validate_excluder.yml
+ vars:
+ excluder: "{{ openshift.common.service_type }}-excluder"
+ when: enable_openshift_excluder | default(enable_excluders) | default(True) | bool
+
# disable excluders based on their status
- include_role: