Browse Source

include user_data template for all host types

Jason DeTiberus 9 years ago
parent
commit
bcf750f83a

+ 1 - 1
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:

+ 4 - 2
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