diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-22 15:36:43 -0500 |
---|---|---|
committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-22 15:36:43 -0500 |
commit | 660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6 (patch) | |
tree | 04130cdcd64e3cac60950577e053708e56b29a95 /roles/openshift_metrics | |
parent | 9240e0d006198f910ea01d34d57f04f9ecd8e7e8 (diff) | |
download | openshift-660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6.tar.gz openshift-660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6.tar.bz2 openshift-660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6.tar.xz openshift-660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6.zip |
Updating default behavior for installing metrics and logging. Separating out uninstall to own variable
Diffstat (limited to 'roles/openshift_metrics')
-rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 3 | ||||
-rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index 354008206..ed0182ba8 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -1,6 +1,7 @@ --- openshift_metrics_start_cluster: True -openshift_metrics_install_metrics: True +openshift_metrics_install_metrics: False +openshift_metrics_uninstall_metrics: False openshift_metrics_startup_timeout: 500 openshift_metrics_hawkular_replicas: 1 diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index eaabdd20f..0461039fc 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -43,7 +43,13 @@ check_mode: no tags: metrics_init -- include: "{{ (openshift_metrics_install_metrics | bool) | ternary('install_metrics.yaml','uninstall_metrics.yaml') }}" +- include: install_metrics.yaml + when: + - openshift_metrics_install_metrics | default(false) | bool + +- include: uninstall_metrics.yaml + when: + - openshift_metrics_uninstall_metrics | default(false) | bool - include: uninstall_hosa.yaml when: not openshift_metrics_install_hawkular_agent | bool |