summaryrefslogtreecommitdiffstats
path: root/playbooks/aws
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-11-18 15:41:35 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-11-18 15:41:35 -0500
commit07b8c1d6233574100a067f9765741da7a62e2d7a (patch)
treebff6c93332d4ff61e7834b11b87f03cdd123860b /playbooks/aws
parente436b4072d78c9386c5ddfd34eddc73833466488 (diff)
parent666fd1d7ef9072f2b022260aebfdc55437be9220 (diff)
downloadopenshift-07b8c1d6233574100a067f9765741da7a62e2d7a.tar.gz
openshift-07b8c1d6233574100a067f9765741da7a62e2d7a.tar.bz2
openshift-07b8c1d6233574100a067f9765741da7a62e2d7a.tar.xz
openshift-07b8c1d6233574100a067f9765741da7a62e2d7a.zip
Merge pull request #934 from detiber/requiretty
ec2 - force !requiretty for ssh_user
Diffstat (limited to 'playbooks/aws')
-rw-r--r--playbooks/aws/openshift-cluster/templates/user_data.j27
1 files changed, 7 insertions, 0 deletions
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index 82c2f4d57..ea4c05ca8 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -43,3 +43,10 @@ growpart:
runcmd:
- xfs_growfs /var
{% endif %}
+
+{% if deployment_vars[deployment_type].sudo %}
+- path: /etc/sudoers.d/99-{{ deployment_vars[deployment_type].ssh_user }}-cloud-init-requiretty
+ permissions: 440
+ content: |
+ Defaults:{{ deployment_vars[deployment_type].ssh_user }} !requiretty
+{% endif %}