summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-07 08:30:17 -0400
committerGitHub <noreply@github.com>2017-07-07 08:30:17 -0400
commit5f49d32bb1c469639802a230c3f3364823a611ae (patch)
tree6c333b8af4c04193439163717c89467251a087cd
parent12654fbe2ff56e7ba9eab61554f86a4164052a18 (diff)
parent00bfd33414ebbb53069859883c601b6e9297da61 (diff)
downloadopenshift-5f49d32bb1c469639802a230c3f3364823a611ae.tar.gz
openshift-5f49d32bb1c469639802a230c3f3364823a611ae.tar.bz2
openshift-5f49d32bb1c469639802a230c3f3364823a611ae.tar.xz
openshift-5f49d32bb1c469639802a230c3f3364823a611ae.zip
Merge pull request #4692 from shawn-hurley/bugzilla-1467948
1467948 - Ansible Service Broker configuration values
-rw-r--r--roles/ansible_service_broker/defaults/main.yml3
-rw-r--r--roles/ansible_service_broker/tasks/install.yml6
2 files changed, 7 insertions, 2 deletions
diff --git a/roles/ansible_service_broker/defaults/main.yml b/roles/ansible_service_broker/defaults/main.yml
index 4a7252679..aa1c5022b 100644
--- a/roles/ansible_service_broker/defaults/main.yml
+++ b/roles/ansible_service_broker/defaults/main.yml
@@ -2,5 +2,8 @@
ansible_service_broker_remove: false
ansible_service_broker_log_level: info
+ansible_service_broker_output_request: false
+ansible_service_broker_recovery: true
# Recommended you do not enable this for now
+ansible_service_broker_dev_broker: false
ansible_service_broker_launch_apb_on_bind: false
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index 9c3379291..8cacf3276 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -250,8 +250,10 @@
color: true
openshift: {}
broker:
- devbroker: false
- launchapbonbind: "{{ ansible_service_broker_launch_apb_on_bind }}"
+ dev_broker: "{{ ansible_service_broker_dev_broker }}"
+ launch_apb_on_bind: "{{ ansible_service_broker_launch_apb_on_bind }}"
+ recovery: "{{ ansible_service_broker_recovery }}"
+ output_request: "{{ ansible_service_broker_output_request }}"
- name: Create the Broker resource in the catalog
oc_obj: