summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-08 16:11:50 -0500
committerGitHub <noreply@github.com>2017-11-08 16:11:50 -0500
commita85af3b9dd028d5f584ecba9bf0ab2f8cfc3a70b (patch)
tree5dc057a788bb56aebbc3e374fcfb21c77dabe109
parent8c7f7f95ecba778c9015d6b3a6508f35bd6db0d3 (diff)
parentd869e711b957029d98760901978d46902bc4b927 (diff)
downloadopenshift-a85af3b9dd028d5f584ecba9bf0ab2f8cfc3a70b.tar.gz
openshift-a85af3b9dd028d5f584ecba9bf0ab2f8cfc3a70b.tar.bz2
openshift-a85af3b9dd028d5f584ecba9bf0ab2f8cfc3a70b.tar.xz
openshift-a85af3b9dd028d5f584ecba9bf0ab2f8cfc3a70b.zip
Merge pull request #6067 from shawn-hurley/bug-specify-keep-namespace
Bug 151186 - Adding configuration for keeping transient namespace on error.
-rw-r--r--roles/ansible_service_broker/defaults/main.yml2
-rw-r--r--roles/ansible_service_broker/tasks/install.yml2
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/ansible_service_broker/defaults/main.yml b/roles/ansible_service_broker/defaults/main.yml
index 7823d8701..bea126618 100644
--- a/roles/ansible_service_broker/defaults/main.yml
+++ b/roles/ansible_service_broker/defaults/main.yml
@@ -10,6 +10,8 @@ ansible_service_broker_dev_broker: false
ansible_service_broker_refresh_interval: 600s
# Recommended you do not enable this for now
ansible_service_broker_launch_apb_on_bind: false
+ansible_service_broker_keep_namespace_on_error: true
+ansible_service_broker_keep_namespace: false
ansible_service_broker_image_pull_policy: IfNotPresent
ansible_service_broker_sandbox_role: edit
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index ce7219aaa..ff90f59a3 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -430,6 +430,8 @@
bearer_token_file: ""
sandbox_role: {{ ansible_service_broker_sandbox_role }}
image_pull_policy: {{ ansible_service_broker_image_pull_policy }}
+ keep_namespace: {{ ansible_service_broker_keep_namespace | bool | lower }}
+ keep_namespace_on_error: {{ ansible_service_broker_keep_namespace_on_error | bool | lower }}
broker:
dev_broker: {{ ansible_service_broker_dev_broker | bool | lower }}
bootstrap_on_startup: {{ ansible_service_broker_bootstrap_on_startup | bool | lower }}