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/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/gce/openshift-cluster/config.yml') diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml index 8bc9b1e53..5a812f6b9 100644 --- a/playbooks/gce/openshift-cluster/config.yml +++ b/playbooks/gce/openshift-cluster/config.yml @@ -6,7 +6,7 @@ - ../../gce/openshift-cluster/vars.yml - ../../gce/openshift-cluster/cluster_hosts.yml vars: - g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" + g_ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(deployment_vars[deployment_type].ssh_user, true) }}" g_sudo: "{{ deployment_vars[deployment_type].sudo }}" g_nodeonmaster: true openshift_cluster_id: "{{ cluster_id }}" -- cgit v1.2.3 From e1ff6a9e2e6b60b427effdbe2d205ebcb065b26f Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Fri, 29 Jan 2016 22:05:09 -0500 Subject: remove outdated comments --- playbooks/gce/openshift-cluster/config.yml | 2 -- 1 file changed, 2 deletions(-) (limited to 'playbooks/gce/openshift-cluster/config.yml') diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml index 5a812f6b9..45150a67f 100644 --- a/playbooks/gce/openshift-cluster/config.yml +++ b/playbooks/gce/openshift-cluster/config.yml @@ -1,6 +1,4 @@ --- -# TODO: fix firewall related bug with GCE and origin, since GCE is overriding -# /etc/sysconfig/iptables - include: ../../common/openshift-cluster/config.yml vars_files: - ../../gce/openshift-cluster/vars.yml -- 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/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/gce/openshift-cluster/config.yml') diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml index 45150a67f..d1aa31bc8 100644 --- a/playbooks/gce/openshift-cluster/config.yml +++ b/playbooks/gce/openshift-cluster/config.yml @@ -4,7 +4,7 @@ - ../../gce/openshift-cluster/vars.yml - ../../gce/openshift-cluster/cluster_hosts.yml vars: - g_ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(deployment_vars[deployment_type].ssh_user, true) }}" + g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" g_sudo: "{{ deployment_vars[deployment_type].sudo }}" g_nodeonmaster: true openshift_cluster_id: "{{ cluster_id }}" -- cgit v1.2.3