summaryrefslogtreecommitdiffstats
path: root/playbooks/aws
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-11-18 11:10:16 +0100
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-11-18 11:13:25 +0100
commit31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c (patch)
tree4395cf50d5835ce01b0dce77790dcbe40bd2f9ea /playbooks/aws
parent544633e687e4d51c169eca435f7f356aad78bacf (diff)
downloadopenshift-31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c.tar.gz
openshift-31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c.tar.bz2
openshift-31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c.tar.xz
openshift-31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c.zip
add a volume on master host, in AWS provisioning
Diffstat (limited to 'playbooks/aws')
-rw-r--r--playbooks/aws/openshift-cluster/tasks/launch_instances.yml4
-rw-r--r--playbooks/aws/openshift-cluster/templates/user_data.j22
2 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 9c699120b..f392fdbc3 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -97,6 +97,10 @@
volume_size: "{{ lookup('env', 'os_master_root_vol_size') | default(25, true) }}"
device_type: "{{ lookup('env', 'os_master_root_vol_type') | default('gp2', true) }}"
iops: "{{ lookup('env', 'os_master_root_vol_iops') | default(500, true) }}"
+ docker:
+ volume_size: "{{ lookup('env', 'os_docker_vol_size') | default(10, true) }}"
+ device_type: "{{ lookup('env', 'os_docker_vol_type') | default('gp2', true) }}"
+ iops: "{{ lookup('env', 'os_docker_vol_iops') | default(500, true) }}"
node:
root:
volume_size: "{{ lookup('env', 'os_node_root_vol_size') | default(85, true) }}"
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index 82c2f4d57..b7d89eac1 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -19,7 +19,7 @@ fs_setup:
partition: auto
{% endif %}
-{% if type == 'node' %}
+{% if type == 'node' or type == 'master' %}
mounts:
- [ xvdb ]
- [ ephemeral0 ]