From b5122288254db255ddc60b1e9095047abdf8c9e3 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
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/vars.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'playbooks/gce/openshift-cluster/vars.yml')
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
index f004a9e6b..d0c8a090f 100644
--- a/playbooks/gce/openshift-cluster/vars.yml
+++ b/playbooks/gce/openshift-cluster/vars.yml
@@ -9,9 +9,9 @@ deployment_rhel7_ent_base:
deployment_vars:
origin:
- image: preinstalled-slave-50g-v5
+ image: centos-7
machine_type: n1-standard-1
- ssh_user: root
+ ssh_user: "{{ ansible_ssh_user }}"
sudo: yes
online:
image: libra-rhel7
--
cgit v1.2.3
From 2f3458447c23e8020af3dc08444fdb33201118e3 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 2 Feb 2016 14:42:23 -0500
Subject: Improve docs and consistency of setting the ssh_user
---
playbooks/gce/openshift-cluster/vars.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'playbooks/gce/openshift-cluster/vars.yml')
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
index d0c8a090f..1ae73fd68 100644
--- a/playbooks/gce/openshift-cluster/vars.yml
+++ b/playbooks/gce/openshift-cluster/vars.yml
@@ -4,14 +4,14 @@ debug_level: 2
deployment_rhel7_ent_base:
image: rhel-7
machine_type: n1-standard-1
- ssh_user:
+ ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(ansible_ssh_user, true) }}"
sudo: yes
deployment_vars:
origin:
image: centos-7
machine_type: n1-standard-1
- ssh_user: "{{ ansible_ssh_user }}"
+ ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(ansible_ssh_user, true) }}"
sudo: yes
online:
image: libra-rhel7
--
cgit v1.2.3