From 2d3691c0038721c271f26562efdd010ae89f6e67 Mon Sep 17 00:00:00 2001 From: Giuseppe Di Piazza <41148801+dipiazzg@users.noreply.github.com> Date: Tue, 26 Apr 2022 10:49:22 +0100 Subject: [PATCH] [FEATURE] Make instance_profile hottype definible (#116) --- .../aws/testid/eu-west-1/sandbox/cluster_vars__buildenv.yml | 1 + create/tasks/create_aws.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/EXAMPLE/cluster_defs/aws/testid/eu-west-1/sandbox/cluster_vars__buildenv.yml b/EXAMPLE/cluster_defs/aws/testid/eu-west-1/sandbox/cluster_vars__buildenv.yml index 6892f033..4fc3acfb 100644 --- a/EXAMPLE/cluster_defs/aws/testid/eu-west-1/sandbox/cluster_vars__buildenv.yml +++ b/EXAMPLE/cluster_defs/aws/testid/eu-west-1/sandbox/cluster_vars__buildenv.yml @@ -36,6 +36,7 @@ cluster_vars: auto_volumes: [ ] flavor: t4g.nano # image: "ami-0c28049fa5618bca4" # eu-west-1 20.04 arm64 hvm-ssd 20210820. Ubuntu images can be located at https://cloud-images.ubuntu.com/locator/ + instance_profile_name: "instance-profile-name" # instance_profile_namecan be specified either at cluster level or hosttype level version: "{{sys_version | default('')}}" vms_by_az: { a: 1, b: 0, c: 0 } diff --git a/create/tasks/create_aws.yml b/create/tasks/create_aws.yml index 20e58c14..f4ad3ad0 100644 --- a/create/tasks/create_aws.yml +++ b/create/tasks/create_aws.yml @@ -39,7 +39,7 @@ region: "{{cluster_vars.region}}" key_name: "{{cluster_vars[buildenv].key_name}}" instance_type: "{{item.flavor}}" - instance_profile_name: "{{cluster_vars.instance_profile_name | default(omit)}}" + instance_profile_name: "{{cluster_vars[buildenv].hosttype_vars[item.hosttype].instance_profile_name | default(cluster_vars.instance_profile_name | default(omit))}}" instance_initiated_shutdown_behavior: "{{cluster_vars[buildenv].hosttype_vars[item.hosttype].instance_initiated_shutdown_behavior | default(omit)}}" spot_price: "{{cluster_vars[buildenv].hosttype_vars[item.hosttype].spot.spot_price | default(omit)}}" spot_wait_timeout: "{{cluster_vars[buildenv].hosttype_vars[item.hosttype].spot.spot_wait_timeout | default(10800)}}" #3 hours