summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2017-09-22 15:36:43 -0500
committerEric Wolinetz <ewolinet@redhat.com>2017-09-22 15:36:43 -0500
commit660bafe9cd0adbfa965bb3f8f31d6c043a0dc5d6 (patch)
tree04130cdcd64e3cac60950577e053708e56b29a95 /roles/openshift_logging
parent9240e0d006198f910ea01d34d57f04f9ecd8e7e8 (diff)
downloadopenshift-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_logging')
-rw-r--r--roles/openshift_logging/defaults/main.yml3
-rw-r--r--roles/openshift_logging/tasks/main.yaml9
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