diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-22 13:22:01 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-22 13:22:01 -0500 |
commit | 3b8eb395b3e8c11679d86a0b712054fefad88914 (patch) | |
tree | 073e9c105b91b707076a5b4a7d29f6ac8b0019ef /inventory | |
parent | 896a0c90b34217fab19160ea48c51f926fbcdeed (diff) | |
parent | bef8371a73fe056b7b93971ee5574721e5465c8e (diff) | |
download | openshift-3b8eb395b3e8c11679d86a0b712054fefad88914.tar.gz openshift-3b8eb395b3e8c11679d86a0b712054fefad88914.tar.bz2 openshift-3b8eb395b3e8c11679d86a0b712054fefad88914.tar.xz openshift-3b8eb395b3e8c11679d86a0b712054fefad88914.zip |
Merge pull request #3982 from jim-minter/trello131-broker-configuration
Merged by openshift-bot
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
-rw-r--r-- | inventory/byo/hosts.ose.example | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 4c601e955..d52036930 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -754,6 +754,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Or you may optionally define your own build overrides configuration serialized as json #openshift_buildoverrides_json='{"BuildOverrides":{"configuration":{"apiVersion":"v1","kind":"BuildDefaultsConfig","forcePull":"true"}}}' +# Enable template service broker by specifying one of more namespaces whose +# templates will be served by the broker +#openshift_template_service_broker_namespaces=['openshift'] + # masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default #openshift_master_dynamic_provisioning_enabled=False diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 612a6f7c8..647dd3d9a 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -755,6 +755,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Or you may optionally define your own build overrides configuration serialized as json #openshift_buildoverrides_json='{"BuildOverrides":{"configuration":{"apiVersion":"v1","kind":"BuildDefaultsConfig","forcePull":"true"}}}' +# Enable template service broker by specifying one of more namespaces whose +# templates will be served by the broker +#openshift_template_service_broker_namespaces=['openshift'] + # masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default #openshift_master_dynamic_provisioning_enabled=False |