From 01ee65e99d39265f7d8db3ddbeca5d59ddfa2038 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 23 Mar 2015 23:37:19 -0400
Subject: gce inventory/playbook updates for node registration changes

---
 inventory/gce/group_vars/all                            | 3 +++
 inventory/gce/group_vars/tag_host-type-master           | 5 +++++
 inventory/gce/group_vars/tag_host-type-node             | 6 ++++++
 inventory/gce/group_vars/tag_host-type-openshift-master | 1 +
 inventory/gce/group_vars/tag_host-type-openshift-node   | 1 +
 playbooks/gce/openshift-node/config.yml                 | 6 +++---
 6 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 inventory/gce/group_vars/tag_host-type-master
 create mode 100644 inventory/gce/group_vars/tag_host-type-node
 create mode 120000 inventory/gce/group_vars/tag_host-type-openshift-master
 create mode 120000 inventory/gce/group_vars/tag_host-type-openshift-node

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
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index d24acb8fa..bf28fc81d 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -6,12 +6,12 @@
     add_host: "name={{ item }} groups=oo_nodes_to_config"
     with_items: "{{ oo_host_group_exp | default('') }}"
     when: oo_host_group_exp is defined
- - name: Find masters for env
+  - name: Find masters for env
     add_host: "name={{ item }} groups=oo_masters_for_node_config"
     with_items: groups['tag_env-host-type-' + oo_env + '-openshift-master']
 
 - name: Gather facts for masters in {{ oo_env }}
-  hosts: "tag_env-host-type-{{ oo_env }}-openshift-master"
+  hosts: tag_env-host-type-{{ oo_env }}-openshift-master
   tasks:
   - set_fact:
       openshift_master_ip: "{{ openshift_ip }}"
@@ -68,7 +68,7 @@
 #
 - name: Configure instances
   hosts: oo_nodes_to_config
-vars_files:
+  vars_files:
   - vars.yml
   vars:
     openshift_master_group: tag_env-host-type-{{ oo_env }}-openshift-master
-- 
cgit v1.2.3