diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-30 12:55:50 -0300 |
| commit | f24cc239bcd10d51427a751044b73d1c6470b9b2 (patch) | |
| tree | ee5beb65f650c1c76466acb1da11f999504e958b /playbooks/gce/openshift-cluster/tasks | |
| parent | 265daf6b65206fc17ad35e682640477d08efbc43 (diff) | |
| parent | 4b734695abf9ca112c9ad3be33f03fcd1a1e7abf (diff) | |
| download | openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.gz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.bz2 openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.tar.xz openshift-f24cc239bcd10d51427a751044b73d1c6470b9b2.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/gce/openshift-cluster/tasks')
| -rw-r--r-- | playbooks/gce/openshift-cluster/tasks/launch_instances.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml index e3efd8566..c5c479052 100644 --- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml @@ -17,6 +17,11 @@ - clusterid-{{ cluster_id }} - host-type-{{ type }} - sub-host-type-{{ g_sub_host_type }} + metadata: + startup-script: | + #!/bin/bash + echo "Defaults:{{ deployment_vars[deployment_type].ssh_user }} !requiretty" > /etc/sudoers.d/99-{{ deployment_vars[deployment_type].ssh_user }} + when: instances |length > 0 register: gce |