diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-07-09 14:49:57 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-07-09 14:49:57 -0400 |
| commit | bcf750f83a87934027358a4631efa54bed73c05f (patch) | |
| tree | 3ff724b7efe69fd47c6406fd54f2c49569e3059e | |
| parent | 76ad5ac0475a6d1d643b833d19aa0240b3ac95a5 (diff) | |
| download | openshift-bcf750f83a87934027358a4631efa54bed73c05f.tar.gz openshift-bcf750f83a87934027358a4631efa54bed73c05f.tar.bz2 openshift-bcf750f83a87934027358a4631efa54bed73c05f.tar.xz openshift-bcf750f83a87934027358a4631efa54bed73c05f.zip | |
include user_data template for all host types
| -rw-r--r-- | playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/templates/user_data.j2 | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml index 060147659..d643b647d 100644 --- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml @@ -51,7 +51,7 @@ - set_fact: latest_ami: "{{ ami_result.results | oo_ami_selector(ec2_image_name) }}" - user_data: "{{ lookup('template', '../templates/user_data.j2') if type == 'node' else None | default('omit') }}" + user_data: "{{ lookup('template', '../templates/user_data.j2') }}" volume_defs: master: root: diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2 index 22cccd977..db14bacd1 100644 --- a/playbooks/aws/openshift-cluster/templates/user_data.j2 +++ b/playbooks/aws/openshift-cluster/templates/user_data.j2 @@ -1,6 +1,5 @@ #cloud-config -devices: ['/var'] # Workaround for https://bugs.launchpad.net/bugs/1455436 - +{% if type == 'node' %} mounts: - [ xvdb ] - [ ephemeral0 ] @@ -12,8 +11,11 @@ write_files: path: /etc/sysconfig/docker-storage-setup owner: root:root permissions: '0644' +{% endif %} {% if deployment_type == 'online' %} +devices: ['/var'] # Workaround for https://bugs.launchpad.net/bugs/1455436 + disable_root: 0 growpart: mode: auto |