浏览代码

Remove duplicate defaulting for ASB and TSB

Scott Dodson 7 年之前
父节点
当前提交
26a6ddc4fb

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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']

+ 2 - 2
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