diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-31 09:04:10 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2018-01-31 09:04:10 -0500 |
| commit | 686e44eb23324044490facfa0514f5d480c8b8c1 (patch) | |
| tree | 017e8f96ea15c30813c190a198ad362beb5e4840 | |
| parent | 2afe2596c6dd9641bdbb3c6294d5df53f5c140f5 (diff) | |
| download | openshift-686e44eb23324044490facfa0514f5d480c8b8c1.tar.gz openshift-686e44eb23324044490facfa0514f5d480c8b8c1.tar.bz2 openshift-686e44eb23324044490facfa0514f5d480c8b8c1.tar.xz openshift-686e44eb23324044490facfa0514f5d480c8b8c1.zip | |
Don't update master-config.yaml with logging/metrics urls >= 3.9
| -rw-r--r-- | playbooks/adhoc/openshift_hosted_logging_efk.yaml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-logging/private/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/openshift-metrics/private/config.yml | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml index faeb332ad..dc6bbeac5 100644 --- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml +++ b/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 diff --git a/playbooks/openshift-logging/private/config.yml b/playbooks/openshift-logging/private/config.yml index d6b26647c..07aa8bfde 100644 --- a/playbooks/openshift-logging/private/config.yml +++ b/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 diff --git a/playbooks/openshift-metrics/private/config.yml b/playbooks/openshift-metrics/private/config.yml index 1e237e3f0..889ea77b1 100644 --- a/playbooks/openshift-metrics/private/config.yml +++ b/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 |