summaryrefslogtreecommitdiffstats
path: root/roles/openshift_aws/tasks/launch_config_create.yml
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-14 21:22:19 -0800
committerGitHub <noreply@github.com>2017-11-14 21:22:19 -0800
commitec564267f4a25036c92a71be481cfd9e4c03537a (patch)
tree0e46cd945ae5ddf1c0fe5ef3411fae10da18c314 /roles/openshift_aws/tasks/launch_config_create.yml
parentc5afbd8a7643f323f02c3bb1c04cf7f40444995c (diff)
parent2a5352ee4fc3962dabd580f7807adb489e8da965 (diff)
downloadopenshift-ec564267f4a25036c92a71be481cfd9e4c03537a.tar.gz
openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.tar.bz2
openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.tar.xz
openshift-ec564267f4a25036c92a71be481cfd9e4c03537a.zip
Merge pull request #6095 from kwoodson/add_instance_profile_support
Automatic merge from submit-queue. Instance profile support. Purpose of this PR is to remove the AWS cloud-provider credentials from the node and use instance profiles during provisioning time.
Diffstat (limited to 'roles/openshift_aws/tasks/launch_config_create.yml')
-rw-r--r--roles/openshift_aws/tasks/launch_config_create.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_aws/tasks/launch_config_create.yml b/roles/openshift_aws/tasks/launch_config_create.yml
index 8265c2179..a688496d2 100644
--- a/roles/openshift_aws/tasks/launch_config_create.yml
+++ b/roles/openshift_aws/tasks/launch_config_create.yml
@@ -15,6 +15,10 @@
image_id: "{{ l_aws_ami_map[launch_config_item.key] | default(openshift_aws_ami) }}"
instance_type: "{{ launch_config_item.value.instance_type }}"
security_groups: "{{ openshift_aws_launch_config_security_group_id | default(ec2sgs.security_groups | map(attribute='group_id')| list) }}"
+ instance_profile_name: "{{ launch_config_item.value.iam_role if launch_config_item.value.iam_role is defined and
+ launch_config_item.value.iam_role != '' and
+ openshift_aws_create_iam_role
+ else omit }}"
user_data: "{{ lookup('template', 'user_data.j2') }}"
key_name: "{{ openshift_aws_ssh_key_name }}"
ebs_optimized: False