diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-25 09:54:36 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-25 09:54:36 -0400 |
| commit | 00eba039c9312fbd04cc05a8a890ef48f2311769 (patch) | |
| tree | 3ad1665eb4731687c5b8cdcafde9ce00aefe3865 /playbooks/aws/openshift-cluster/templates/user_data.j2 | |
| parent | 82d3a4bac81d67d8575279fe99352700d65ca7f6 (diff) | |
| parent | 4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764 (diff) | |
| download | openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.tar.gz openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.tar.bz2 openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.tar.xz openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.zip | |
Merge pull request #1773 from detiber/aws_cleanup
Cloud provider cleanup
Diffstat (limited to 'playbooks/aws/openshift-cluster/templates/user_data.j2')
| -rw-r--r-- | playbooks/aws/openshift-cluster/templates/user_data.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2 index 2a3974a8c..b1087f9c4 100644 --- a/playbooks/aws/openshift-cluster/templates/user_data.j2 +++ b/playbooks/aws/openshift-cluster/templates/user_data.j2 @@ -3,8 +3,10 @@ mounts: - [ xvdb ] - [ ephemeral0 ] +{% endif %} write_files: +{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %} - content: | DEVS=/dev/xvdb VG=docker_vg @@ -12,8 +14,7 @@ write_files: owner: root:root permissions: '0644' {% endif %} - -{% if deployment_vars[deployment_type].become %} +{% if deployment_vars[deployment_type].become | bool %} - path: /etc/sudoers.d/99-{{ deployment_vars[deployment_type].ssh_user }}-cloud-init-requiretty permissions: 440 content: | |