summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-04-20 17:21:24 -0400
committerScott Dodson <sdodson@redhat.com>2017-04-20 17:59:41 -0400
commitcec20af6b3c11e7b45420a372f640372298db2be (patch)
tree7b9f6807ce2dbfce1c08533f1d4d885737347d55 /playbooks/common
parentb6d96f6fa604684616aaed1cf94bcc98df276f80 (diff)
downloadopenshift-cec20af6b3c11e7b45420a372f640372298db2be.tar.gz
openshift-cec20af6b3c11e7b45420a372f640372298db2be.tar.bz2
openshift-cec20af6b3c11e7b45420a372f640372298db2be.tar.xz
openshift-cec20af6b3c11e7b45420a372f640372298db2be.zip
Don't check excluder versions when they're not enabled
Diffstat (limited to 'playbooks/common')
-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: