diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-04-21 00:45:28 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-05 21:23:19 -0400 |
| commit | 866bab53db58352d56e33b8d97ce3b982a850cb9 (patch) | |
| tree | 952e38c88c3f39a2ea7d98eafb17b85889d9a974 /playbooks/aws/openshift-cluster/templates | |
| parent | e4c7c26436d4daf2cbccd54bc91cb5f3471c3dc0 (diff) | |
| download | openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.tar.gz openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.tar.bz2 openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.tar.xz openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.zip | |
aws provider fixes
- fix errors in userdata template
- update origin centos ami
- ensure ec2_tag_sub-host-type is set after launch
- disable openshift_use_dnsmasq for now
- Remove use of vars_files in includes
Diffstat (limited to 'playbooks/aws/openshift-cluster/templates')
| -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: | |