summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-18 14:38:22 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-18 14:51:46 -0500
commitf9d918450b27b8f7429f050ed5f781492406b385 (patch)
treec4dbe821b26bcabbcec5bab07530cdb9f42ebf71 /playbooks
parent31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c (diff)
downloadopenshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.gz
openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.bz2
openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.xz
openshift-f9d918450b27b8f7429f050ed5f781492406b385.zip
small tweaks for adding docker volume for aws master hosts
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/openshift-cluster/tasks/launch_instances.yml3
-rw-r--r--playbooks/aws/openshift-cluster/templates/user_data.j24
2 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index f392fdbc3..b109c165c 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -81,7 +81,6 @@
- set_fact:
latest_ami: "{{ ami_result.results | oo_ami_selector(ec2_image_name) }}"
- user_data: "{{ lookup('template', '../templates/user_data.j2') }}"
volume_defs:
etcd:
root:
@@ -125,7 +124,7 @@
count: "{{ instances | length }}"
vpc_subnet_id: "{{ ec2_vpc_subnet | default(omit, true) }}"
assign_public_ip: "{{ ec2_assign_public_ip | default(omit, true) }}"
- user_data: "{{ user_data }}"
+ user_data: "{{ lookup('template', '../templates/user_data.j2') }}"
wait: yes
instance_tags:
created-by: "{{ created_by }}"
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index b7d89eac1..22ab84977 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -1,5 +1,5 @@
#cloud-config
-{% if type =='etcd' %}
+{% if type == 'etcd' and 'etcd' in volume_defs[type] %}
cloud_config_modules:
- disk_setup
- mounts
@@ -19,7 +19,7 @@ fs_setup:
partition: auto
{% endif %}
-{% if type == 'node' or type == 'master' %}
+{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %}
mounts:
- [ xvdb ]
- [ ephemeral0 ]