diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-15 16:37:48 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-15 16:37:48 -0300 |
| commit | e7925364342c9a324d91e750ba56aa41ad789419 (patch) | |
| tree | 289116d3a701ad67730794f8bcf7d71dbdc657f4 /inventory/byo | |
| parent | 1d764a0bebbbb12e3c3142c59b10fae34c8b7211 (diff) | |
| parent | 30d653aa5b776afbf35c98b1b5e7436f8cb7123c (diff) | |
| download | openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.gz openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.bz2 openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.xz openshift-e7925364342c9a324d91e750ba56aa41ad789419.zip | |
Merge remote-tracking branch 'openshift/master' into project_config
Diffstat (limited to 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts.example | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 6a082e518..b7ad231d7 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -33,7 +33,7 @@ deployment_type=enterprise #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, gpgkey: 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] # htpasswd auth -#openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/openshift/htpasswd'}] +openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/openshift/htpasswd'}] # Allow all auth #openshift_master_identity_providers=[{'name': 'allow_all', 'login': 'true', 'challenge': 'true', 'kind': 'AllowAllPasswordIdentityProvider'}] @@ -68,6 +68,9 @@ deployment_type=enterprise # additional cors origins #osm_custom_cors_origins=['foo.example.com', 'bar.example.com'] +# default project node selector +#osm_default_node_selector='region=primary' + # host group for masters [masters] ose3-master[1:3]-ansible.test.example.com |