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 /roles/openshift_logging | |
| 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…
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 9 |
2 files changed, 7 insertions, 5 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 |