diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-05-21 14:10:35 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-05-21 14:10:35 -0500 |
| commit | c3bd6a3489dd0473334543024efa2c3c96ba8be2 (patch) | |
| tree | 6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /inventory/byo | |
| parent | 1d8e743921a48a5abd2ca75323321f6db261101b (diff) | |
| parent | b151e33e7e49d1de1c58286342d09cc9eba57287 (diff) | |
| download | openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.gz openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.bz2 openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.tar.xz openshift-c3bd6a3489dd0473334543024efa2c3c96ba8be2.zip | |
Merge branch 'master' into int
Diffstat (limited to 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/inventory/byo/hosts b/inventory/byo/hosts index 98dbb4fd8..728eec8aa 100644 --- a/inventory/byo/hosts +++ b/inventory/byo/hosts @@ -20,7 +20,8 @@ deployment_type=enterprise openshift_registry_url=docker-buildvm-rhose.usersys.redhat.com:5000/openshift3_beta/ose-${component}:${version} # Pre-release additional 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}] +#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}] +openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://buildvm-devops.usersys.redhat.com/puddle/build/OpenShiftEnterpriseErrata/3.0/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] # Origin copr repo #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'}] @@ -31,4 +32,5 @@ ose3-master-ansible.test.example.com # host group for nodes [nodes] -ose3-node[1:2]-ansible.test.example.com +ose3-master-ansible.test.example.com openshift_node_labels="{'region': 'infra', 'zone': 'default'}" +ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'primary', 'zone': 'default'}" |