diff options
author | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
---|---|---|
committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
commit | 055921cd545c12733949f37c1af2c0a1296216ec (patch) | |
tree | 0ad645b9a75eacbb168c9fdc92d585867b5317a4 /inventory/byo/hosts.example | |
parent | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (diff) | |
parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
download | openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.gz openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.bz2 openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.xz openshift-055921cd545c12733949f37c1af2c0a1296216ec.zip |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'inventory/byo/hosts.example')
-rw-r--r-- | inventory/byo/hosts.example | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 629956d0e..0f9f2caf9 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -21,7 +21,7 @@ ansible_ssh_user=root deployment_type=enterprise # Pre-release registry URL -#oreg_url=docker-buildvm-rhose.usersys.redhat.com:5000/openshift3/ose-${component}:${version} +#oreg_url=rcm-img-docker01.build.eng.bos.redhat.com:5001/openshift3/ose-${component}:${version} # Pre-release Dev puddle repo #openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://buildvm-devops.usersys.redhat.com/puddle/build/OpenShiftEnterprise/3.0/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] @@ -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'}] @@ -60,6 +60,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 |