summaryrefslogtreecommitdiffstats
path: root/inventory/gce
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-13 03:58:23 -0400
committerJhon Honce <jhonce@redhat.com>2015-03-24 11:13:26 -0700
commit9199379f94f6b11a4841e31f6c58a11c1e9f8c3a (patch)
tree3250d896343b148edebf4e4e7283261c3eb60acb /inventory/gce
parente337235d471468b400acadcbd56ad14f39a2a222 (diff)
downloadopenshift-9199379f94f6b11a4841e31f6c58a11c1e9f8c3a.tar.gz
openshift-9199379f94f6b11a4841e31f6c58a11c1e9f8c3a.tar.bz2
openshift-9199379f94f6b11a4841e31f6c58a11c1e9f8c3a.tar.xz
openshift-9199379f94f6b11a4841e31f6c58a11c1e9f8c3a.zip
Various fixes
- playbooks/gce/openshift-cluster: - Remove some stray debugging statements - Some minor formatting fixes - removing un-necessary quotes - cleaning up some jinja templates for readability - add a play to the launch playbook to apply the os_update_latest role on all hosts in the new environment - improve setting groups and gce_public_ip when using add_host module - set gce_public_ip as a variable for the host using the returned gce instance_data - add a group for each tag configured on the host (pre-pending tag_ to the tag name) - update the openshift-master/config.yml and openshift-node/config.yml includes to use the tag_env-host-type groups - openshift-{master,node}/config.yml - Some cleanup - remove some extraneous quotes - remove connection: ssh from remote hosts, since it is the default - remove user: root and instead set ansible_ssh_user in inventory/gce/group_vars/all - set openshift_public_ip and openshift_env to templated values in inventory/gce/group_vars/all as well - no longer set openshift_node_ips for the master host, since nodes will register themselves now when they are configured (prevent reboot on adding nodes) - move setting openshift_master_ips and openshift_public_master_ips using set_fact and instead use the vars: of the 'Configure Instances' play
Diffstat (limited to 'inventory/gce')
-rw-r--r--inventory/gce/group_vars/all4
1 files changed, 4 insertions, 0 deletions
diff --git a/inventory/gce/group_vars/all b/inventory/gce/group_vars/all
new file mode 100644
index 000000000..4cd94c509
--- /dev/null
+++ b/inventory/gce/group_vars/all
@@ -0,0 +1,4 @@
+---
+ansible_ssh_user: root
+openshift_public_ip: "{{ gce_public_ip }}"
+openshift_env: "{{ oo_env }}"