summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/tasks
diff options
context:
space:
mode:
authorChengcheng Mu <bob3841b@gmail.com>2015-11-19 08:08:07 +0100
committerChengcheng Mu <bob3841b@gmail.com>2015-11-19 08:08:07 +0100
commit0925d936bf1d5b22951b644d9430f443f0551cac (patch)
treec4dbe821b26bcabbcec5bab07530cdb9f42ebf71 /playbooks/aws/openshift-cluster/tasks
parent31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c (diff)
parentf9d918450b27b8f7429f050ed5f781492406b385 (diff)
downloadopenshift-0925d936bf1d5b22951b644d9430f443f0551cac.tar.gz
openshift-0925d936bf1d5b22951b644d9430f443f0551cac.tar.bz2
openshift-0925d936bf1d5b22951b644d9430f443f0551cac.tar.xz
openshift-0925d936bf1d5b22951b644d9430f443f0551cac.zip
Merge pull request #1 from detiber/dockerOnMasterAWS
small tweaks for adding docker volume for aws master hosts
Diffstat (limited to 'playbooks/aws/openshift-cluster/tasks')
-rw-r--r--playbooks/aws/openshift-cluster/tasks/launch_instances.yml3
1 files changed, 1 insertions, 2 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 }}"