summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/vars.yml
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-02-02 15:20:51 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-02-02 15:20:51 -0500
commitff8f2013a8dde61bc8fe57c545c716b9a3dc4098 (patch)
tree6e14488702f5538d238fe89451e7fdb4ca7087b7 /playbooks/gce/openshift-cluster/vars.yml
parent8ed73ca866da18963a7868eb1d0f66ba63a0d425 (diff)
parent2f3458447c23e8020af3dc08444fdb33201118e3 (diff)
downloadopenshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.tar.gz
openshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.tar.bz2
openshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.tar.xz
openshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.zip
Merge pull request #1238 from detiber/gce_fixes
GCE cloud provider updates
Diffstat (limited to 'playbooks/gce/openshift-cluster/vars.yml')
-rw-r--r--playbooks/gce/openshift-cluster/vars.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
index f004a9e6b..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: preinstalled-slave-50g-v5
+ image: centos-7
machine_type: n1-standard-1
- ssh_user: root
+ ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(ansible_ssh_user, true) }}"
sudo: yes
online:
image: libra-rhel7