diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-17 05:43:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 05:43:09 -0700 |
| commit | 1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3 (patch) | |
| tree | 824457588c59efb6c3cdc4472c7b74c081f7cf81 /roles | |
| parent | 768a667c5788a8074ff1f31caf8b43af92f16344 (diff) | |
| parent | 991acfe542464c768cf25868039ae1e364a386ad (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 7 | ||||
| -rw-r--r-- | roles/template_service_broker/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/template_service_broker/tasks/install.yml | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index c555a8791..7159ccc7f 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -275,12 +275,5 @@ servingInfo: - {{ cipher_suite }} {% endfor %} {% endif %} -{% if openshift_template_service_broker_namespaces is defined %} -templateServiceBrokerConfig: - templateNamespaces: -{% for namespace in openshift_template_service_broker_namespaces %} - - {{ namespace }} -{% endfor %} -{% endif %} volumeConfig: dynamicProvisioningEnabled: {{ openshift.master.dynamic_provisioning_enabled }} 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 |