summaryrefslogtreecommitdiffstats
path: root/roles/template_service_broker
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-17 05:43:09 -0700
committerGitHub <noreply@github.com>2017-10-17 05:43:09 -0700
commit1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3 (patch)
tree824457588c59efb6c3cdc4472c7b74c081f7cf81 /roles/template_service_broker
parent768a667c5788a8074ff1f31caf8b43af92f16344 (diff)
parent991acfe542464c768cf25868039ae1e364a386ad (diff)
downloadopenshift-1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3.tar.gz
openshift-1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3.tar.bz2
openshift-1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3.tar.xz
openshift-1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3.zip
Merge pull request #5687 from jim-minter/tsb_config
Automatic merge from submit-queue. Rewire openshift_template_service_broker_namespaces configurable @ewolinetz @bparees
Diffstat (limited to 'roles/template_service_broker')
-rw-r--r--roles/template_service_broker/defaults/main.yml1
-rw-r--r--roles/template_service_broker/tasks/install.yml16
2 files changed, 16 insertions, 1 deletions
diff --git a/roles/template_service_broker/defaults/main.yml b/roles/template_service_broker/defaults/main.yml
index fb407c4a2..a92a138b0 100644
--- a/roles/template_service_broker/defaults/main.yml
+++ b/roles/template_service_broker/defaults/main.yml
@@ -2,3 +2,4 @@
# placeholder file?
template_service_broker_remove: False
template_service_broker_install: False
+openshift_template_service_broker_namespaces: ['openshift']
diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml
index f5fd6487c..54008bbf1 100644
--- a/roles/template_service_broker/tasks/install.yml
+++ b/roles/template_service_broker/tasks/install.yml
@@ -28,10 +28,24 @@
- "{{ __tsb_template_file }}"
- "{{ __tsb_rbac_file }}"
- "{{ __tsb_broker_file }}"
+ - "{{ __tsb_config_file }}"
+
+- yedit:
+ src: "{{ mktemp.stdout }}/{{ __tsb_config_file }}"
+ key: templateNamespaces
+ value: "{{ openshift_template_service_broker_namespaces }}"
+ value_type: list
+
+- slurp:
+ src: "{{ mktemp.stdout }}/{{ __tsb_config_file }}"
+ register: config
- name: Apply template file
shell: >
- oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}" --param API_SERVER_CONFIG="{{ lookup('file', __tsb_files_location ~ '/' ~ __tsb_config_file) }}" --param IMAGE="{{ template_service_broker_prefix }}{{ template_service_broker_image_name }}:{{ template_service_broker_version }}" | kubectl apply -f -
+ oc process -f "{{ mktemp.stdout }}/{{ __tsb_template_file }}"
+ --param API_SERVER_CONFIG="{{ config['content'] | b64decode }}"
+ --param IMAGE="{{ template_service_broker_prefix }}{{ template_service_broker_image_name }}:{{ template_service_broker_version }}"
+ | kubectl apply -f -
# reconcile with rbac
- name: Reconcile with RBAC file