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/openshift_master/templates | |
| 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/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 7 |
1 files changed, 0 insertions, 7 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 }} |