diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-10 01:40:53 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-02 14:42:49 -0500 |
| commit | b5122288254db255ddc60b1e9095047abdf8c9e3 (patch) | |
| tree | be2cb940731a103a334518057a1619322f5ca7be /playbooks/gce/openshift-cluster/config.yml | |
| parent | 8ed73ca866da18963a7868eb1d0f66ba63a0d425 (diff) | |
| download | openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.tar.gz openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.tar.bz2 openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.tar.xz openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.zip | |
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
Diffstat (limited to 'playbooks/gce/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/gce/openshift-cluster/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
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 }}" |