From b5122288254db255ddc60b1e9095047abdf8c9e3 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Sun, 10 Jan 2016 01:40:53 -0500 Subject: GCE cloud provider updates - fix overrides for gce machine type and gce machine image - Update default image for origin - Update default ssh user for origin and enterprise - Remove old commented out code - Remove wip and join_node playbooks - Added add_nodes playbook which will now allow for using bin/cluster to add additional nodes - Allow env override of ssh_user - improve list playbook --- playbooks/gce/openshift-cluster/list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/gce/openshift-cluster/list.yml') diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml index e67685912..c37ddba9a 100644 --- a/playbooks/gce/openshift-cluster/list.yml +++ b/playbooks/gce/openshift-cluster/list.yml @@ -23,4 +23,4 @@ gather_facts: no tasks: - debug: - msg: "private ip:{{ hostvars[inventory_hostname].gce_private_ip }}" + msg: "public ip: {{ hostvars[inventory_hostname].gce_public_ip }} private ip:{{ hostvars[inventory_hostname].gce_private_ip }}" -- cgit v1.2.3 From 2f3458447c23e8020af3dc08444fdb33201118e3 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Tue, 2 Feb 2016 14:42:23 -0500 Subject: Improve docs and consistency of setting the ssh_user --- playbooks/gce/openshift-cluster/list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/gce/openshift-cluster/list.yml') diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml index c37ddba9a..f3004ede9 100644 --- a/playbooks/gce/openshift-cluster/list.yml +++ b/playbooks/gce/openshift-cluster/list.yml @@ -14,7 +14,7 @@ - add_host: name: "{{ item }}" groups: oo_list_hosts - ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}" + ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" with_items: groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true)) -- cgit v1.2.3