summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-23 23:37:19 -0400
committerJhon Honce <jhonce@redhat.com>2015-03-24 11:33:20 -0700
commit01ee65e99d39265f7d8db3ddbeca5d59ddfa2038 (patch)
tree8a716bcbd87412b2718e2cd56ed8638a9494b7dc /inventory
parentde1391db4309f020b5c8467597eef527b560bbaa (diff)
downloadopenshift-01ee65e99d39265f7d8db3ddbeca5d59ddfa2038.tar.gz
openshift-01ee65e99d39265f7d8db3ddbeca5d59ddfa2038.tar.bz2
openshift-01ee65e99d39265f7d8db3ddbeca5d59ddfa2038.tar.xz
openshift-01ee65e99d39265f7d8db3ddbeca5d59ddfa2038.zip
gce inventory/playbook updates for node registration changes
Diffstat (limited to 'inventory')
-rw-r--r--inventory/gce/group_vars/all3
-rw-r--r--inventory/gce/group_vars/tag_host-type-master5
-rw-r--r--inventory/gce/group_vars/tag_host-type-node6
l---------inventory/gce/group_vars/tag_host-type-openshift-master1
l---------inventory/gce/group_vars/tag_host-type-openshift-node1
5 files changed, 16 insertions, 0 deletions
diff --git a/inventory/gce/group_vars/all b/inventory/gce/group_vars/all
index 4cd94c509..3e969df63 100644
--- a/inventory/gce/group_vars/all
+++ b/inventory/gce/group_vars/all
@@ -1,4 +1,7 @@
---
ansible_ssh_user: root
+openshift_hostname: "{{ ansible_default_ipv4.address }}"
+openshift_public_hostname: "{{ ansible_default_ipv4.address }}"
+openshift_ip: "{{ ansible_default_ipv4.address }}"
openshift_public_ip: "{{ gce_public_ip }}"
openshift_env: "{{ oo_env }}"
diff --git a/inventory/gce/group_vars/tag_host-type-master b/inventory/gce/group_vars/tag_host-type-master
new file mode 100644
index 000000000..ddbdc650c
--- /dev/null
+++ b/inventory/gce/group_vars/tag_host-type-master
@@ -0,0 +1,5 @@
+---
+openshift_api_url: https://{{ openshift_hostname }}:8443
+openshift_api_public_url: https://{{ openshift_public_hostname }}:8443
+openshift_webui_url: https://{{ openshift_hostname }}:8444
+openshift_webui_public_url: https://{{ openshift_public_hostname }}:8444
diff --git a/inventory/gce/group_vars/tag_host-type-node b/inventory/gce/group_vars/tag_host-type-node
new file mode 100644
index 000000000..bb95a724d
--- /dev/null
+++ b/inventory/gce/group_vars/tag_host-type-node
@@ -0,0 +1,6 @@
+---
+openshift_node_cpu:
+openshift_node_memory:
+openshift_node_pod_cidr:
+openshift_node_labels: {}
+openshift_node_annotations: {}
diff --git a/inventory/gce/group_vars/tag_host-type-openshift-master b/inventory/gce/group_vars/tag_host-type-openshift-master
new file mode 120000
index 000000000..c0c4cf370
--- /dev/null
+++ b/inventory/gce/group_vars/tag_host-type-openshift-master
@@ -0,0 +1 @@
+tag_host-type-master \ No newline at end of file
diff --git a/inventory/gce/group_vars/tag_host-type-openshift-node b/inventory/gce/group_vars/tag_host-type-openshift-node
new file mode 120000
index 000000000..ebbce6136
--- /dev/null
+++ b/inventory/gce/group_vars/tag_host-type-openshift-node
@@ -0,0 +1 @@
+tag_host-type-node \ No newline at end of file