summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-06 09:46:04 -0500
committerScott Dodson <sdodson@redhat.com>2017-11-08 13:52:50 -0500
commit26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24 (patch)
tree79ab0652029ae1658876031268d7f34d76a25c9c
parenta4d4b530bd4390a4a7f4cc277d02fd52796ee144 (diff)
downloadopenshift-26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24.tar.gz
openshift-26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24.tar.bz2
openshift-26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24.tar.xz
openshift-26a6ddc4fb1be4c8018c5e1f0e8260c9a02ddf24.zip
Remove duplicate defaulting for ASB and TSB
-rw-r--r--roles/ansible_service_broker/defaults/main.yml2
-rw-r--r--roles/ansible_service_broker/tasks/main.yml4
-rw-r--r--roles/template_service_broker/defaults/main.yml2
-rw-r--r--roles/template_service_broker/tasks/main.yml4
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