Bladeren bron

Don't check excluder versions when they're not enabled

Scott Dodson 8 jaren geleden
bovenliggende
commit
cec20af6b3
1 gewijzigde bestanden met toevoegingen van 7 en 6 verwijderingen
  1. 7 6
      playbooks/common/openshift-cluster/upgrades/disable_excluder.yml

+ 7 - 6
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: