diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-22 20:18:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 20:18:30 -0400 |
| commit | 6bee051f9850b6393edc60860993d84cf1e38989 (patch) | |
| tree | 4f9fd740df36327fe15c747d14a6a745df522172 | |
| parent | 4d0bbb8a0be72ca4b8008bbcce8383ea0f704377 (diff) | |
| parent | 660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6 (diff) | |
| download | openshift-6bee051f9850b6393edc60860993d84cf1e38989.tar.gz openshift-6bee051f9850b6393edc60860993d84cf1e38989.tar.bz2 openshift-6bee051f9850b6393edc60860993d84cf1e38989.tar.xz openshift-6bee051f9850b6393edc60860993d84cf1e38989.zip | |
Merge pull request #5511 from ewolinetz/logging_metrics_default_fix
Updating default behavior for installing metrics and logging. Separat…
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 9 | ||||
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 8 |
4 files changed, 16 insertions, 7 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 06bbbc60e..6699e2062 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -7,7 +7,8 @@ openshift_logging_nodeselector: null openshift_logging_labels: {} openshift_logging_label_key: "" openshift_logging_label_value: "" -openshift_logging_install_logging: True +openshift_logging_install_logging: False +openshift_logging_uninstall_logging: False openshift_logging_purge_logging: False openshift_logging_image_pull_secret: "" diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index f475024dd..0da9771c7 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -30,12 +30,13 @@ check_mode: no become: no -- include: "{{ role_path }}/tasks/install_logging.yaml" - when: openshift_logging_install_logging | default(false) | bool +- include: install_logging.yaml + when: + - openshift_logging_install_logging | default(false) | bool -- include: "{{ role_path }}/tasks/delete_logging.yaml" +- include: delete_logging.yaml when: - - not openshift_logging_install_logging | default(false) | bool + - openshift_logging_uninstall_logging | default(false) | bool - name: Cleaning up local temp dir local_action: file path="{{local_tmp.stdout}}" state=absent 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 |