소스 검색

Don't update master-config.yaml with logging/metrics urls >= 3.9

Scott Dodson 7 년 전
부모
커밋
686e44eb23

+ 3 - 1
playbooks/adhoc/openshift_hosted_logging_efk.yaml

@@ -13,4 +13,6 @@
   - import_role:
       name: openshift_logging
       tasks_from: update_master_config
-    when: openshift_hosted_logging_deploy | default(false) | bool
+    when:
+    - openshift_hosted_logging_deploy | default(false) | bool
+    - not openshift.common.version_gte_3_9

+ 1 - 0
playbooks/openshift-logging/private/config.yml

@@ -24,6 +24,7 @@
     - import_role:
         name: openshift_logging
         tasks_from: update_master_config
+      when: not openshift.common.version_gte_3_9
 
 - name: Logging Install Checkpoint End
   hosts: all

+ 1 - 0
playbooks/openshift-metrics/private/config.yml

@@ -25,6 +25,7 @@
     import_role:
       name: openshift_metrics
       tasks_from: update_master_config.yaml
+    when: not openshift.common.version_gte_3_9
 
 - name: Metrics Install Checkpoint End
   hosts: all