From a39380b620c0a71dc3c39d97508a7f7ed254d825 Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Tue, 11 Dec 2018 12:47:25 +0300 Subject: [PATCH] adds parameter aws_ebs_volume_type for aws_manage role Signed-off-by: Andrey Kononykhin --- pool_automation/roles/aws_manage/defaults/main.yml | 1 + pool_automation/roles/aws_manage/tasks/main.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pool_automation/roles/aws_manage/defaults/main.yml b/pool_automation/roles/aws_manage/defaults/main.yml index 4f8e8c5bb..7e24ce660 100644 --- a/pool_automation/roles/aws_manage/defaults/main.yml +++ b/pool_automation/roles/aws_manage/defaults/main.yml @@ -46,6 +46,7 @@ aws_ec2_type: t2.micro aws_ec2_market_spot: true aws_ec2_spot_max_price: null aws_ebs_volume_size: 16 +aws_ebs_volume_type: gp2 # Resource tags and names aws_tag_project: "{{ aws_project_name }}" diff --git a/pool_automation/roles/aws_manage/tasks/main.yml b/pool_automation/roles/aws_manage/tasks/main.yml index 5cb2f7763..758800cc0 100644 --- a/pool_automation/roles/aws_manage/tasks/main.yml +++ b/pool_automation/roles/aws_manage/tasks/main.yml @@ -37,8 +37,9 @@ instance_type: "{{ aws_ec2_type }}" instance_count: "{{ aws_instance_count }}" market_spot: "{{ aws_ec2_market_spot }}" - spot_max_price: "{{ aws_ec2_spot_max_price }}" + spot_max_price: "{{ aws_ec2_spot_max_price|default(omit, True) }}" ebs_volume_size: "{{ aws_ebs_volume_size|int|default(omit, True) }}" + ebs_volume_type: "{{ aws_ebs_volume_type|default(omit, True) }}" register: aws_ec2hosts - name: Post-Up