diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2016-02-02 15:20:51 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2016-02-02 15:20:51 -0500 |
| commit | ff8f2013a8dde61bc8fe57c545c716b9a3dc4098 (patch) | |
| tree | 6e14488702f5538d238fe89451e7fdb4ca7087b7 /playbooks/gce/openshift-cluster/tasks | |
| parent | 8ed73ca866da18963a7868eb1d0f66ba63a0d425 (diff) | |
| parent | 2f3458447c23e8020af3dc08444fdb33201118e3 (diff) | |
| download | openshift-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/tasks')
| -rw-r--r-- | playbooks/gce/openshift-cluster/tasks/launch_instances.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml index 488b62eb9..8ebf71cd4 100644 --- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml @@ -1,7 +1,4 @@ --- -# TODO: when we are ready to go to ansible 1.9+ support only, we can update to -# the gce task to use the disk_auto_delete parameter to avoid having to delete -# the disk as a separate step on termination - name: Launch instance(s) gce: instance_names: "{{ instances }}" @@ -41,7 +38,7 @@ add_host: hostname: "{{ item.name }}" ansible_ssh_host: "{{ item.public_ip }}" - 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 }}" groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}" gce_public_ip: "{{ item.public_ip }}" |