From 26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 6 Nov 2017 09:46:04 -0500 Subject: Remove duplicate defaulting for ASB and TSB --- roles/ansible_service_broker/defaults/main.yml | 2 +- roles/ansible_service_broker/tasks/main.yml | 4 ++-- roles/template_service_broker/defaults/main.yml | 2 +- roles/template_service_broker/tasks/main.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/ansible_service_broker/defaults/main.yml b/roles/ansible_service_broker/defaults/main.yml index 34110ca99..7823d8701 100644 --- a/roles/ansible_service_broker/defaults/main.yml +++ b/roles/ansible_service_broker/defaults/main.yml @@ -1,7 +1,7 @@ --- ansible_service_broker_remove: false -ansible_service_broker_install: false +ansible_service_broker_install: true ansible_service_broker_log_level: info ansible_service_broker_output_request: false ansible_service_broker_recovery: true diff --git a/roles/ansible_service_broker/tasks/main.yml b/roles/ansible_service_broker/tasks/main.yml index 2ed156728..f5e06d163 100644 --- a/roles/ansible_service_broker/tasks/main.yml +++ b/roles/ansible_service_broker/tasks/main.yml @@ -2,7 +2,7 @@ # do any asserts here - include: install.yml - when: ansible_service_broker_install | default(true) | bool + when: ansible_service_broker_install | bool - include: remove.yml - when: ansible_service_broker_remove | default(false) | bool + when: ansible_service_broker_remove | bool diff --git a/roles/template_service_broker/defaults/main.yml b/roles/template_service_broker/defaults/main.yml index a92a138b0..421b4ecf9 100644 --- a/roles/template_service_broker/defaults/main.yml +++ b/roles/template_service_broker/defaults/main.yml @@ -1,5 +1,5 @@ --- # placeholder file? template_service_broker_remove: False -template_service_broker_install: False +template_service_broker_install: True openshift_template_service_broker_namespaces: ['openshift'] diff --git a/roles/template_service_broker/tasks/main.yml b/roles/template_service_broker/tasks/main.yml index da8aa291b..6a4d89a46 100644 --- a/roles/template_service_broker/tasks/main.yml +++ b/roles/template_service_broker/tasks/main.yml @@ -2,7 +2,7 @@ # do any asserts here - include: install.yml - when: template_service_broker_install | default(true) | bool + when: template_service_broker_install | bool - include: remove.yml - when: template_service_broker_remove | default(false) | bool + when: template_service_broker_remove | bool -- cgit v1.2.3