summaryrefslogtreecommitdiffstats
path: root/inventory/byo/hosts
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-05-01 11:29:40 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-05-06 02:10:16 -0400
commit5f09b0e1d3b27fb81473bfd92d424358505969e5 (patch)
tree83d8ff2ab039bf64d48dbfb0626db61d0c86d0d3 /inventory/byo/hosts
parente0b2d98a6cac21cfa555afe4d660cb62c1180856 (diff)
downloadopenshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.tar.gz
openshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.tar.bz2
openshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.tar.xz
openshift-5f09b0e1d3b27fb81473bfd92d424358505969e5.zip
openshift_fact and misc fixes
- Do not attempt to fetch file to same file location when playbooks are run locally on master - Fix for openshift_facts when run against a host in a VPC that does not assign internal/external hostnames or ips - Fix setting of labels and annotations on node instances and in openshift_facts - converted openshift_facts to use json for local_fact storage instead of an ini file, included code that should migrate existing ini users to json - added region/zone setting to byo inventory - Fix fact related bug where deployment_type was being set on node role instead of common role for node hosts
Diffstat (limited to 'inventory/byo/hosts')
-rw-r--r--inventory/byo/hosts6
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'}"