ec2_launch_template: Fix integration tests (#61260)

* ec2_launch_template: (integration tests) make sure security_token is optional

* ec2_launch_template: (integration tests) add dependencies at the top level so they're pulled into the docker containers

* Update Hacking Compute Policies for Launch Templates
This commit is contained in:
Mark Chappell 2019-09-04 21:33:01 +02:00 committed by ansibot
parent 7be672e1c2
commit adfaefb732
4 changed files with 9 additions and 3 deletions

View file

@ -33,6 +33,9 @@
"Sid": "AllowUnspecifiedEC2Resource", "Sid": "AllowUnspecifiedEC2Resource",
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"ec2:*LaunchTemplate",
"ec2:*LaunchTemplateVersion",
"ec2:*LaunchTemplateVersions",
"ec2:AllocateAddress", "ec2:AllocateAddress",
"ec2:AssociateAddress", "ec2:AssociateAddress",
"ec2:AssociateDhcpOptions", "ec2:AssociateDhcpOptions",

View file

@ -0,0 +1,3 @@
dependencies:
- prepare_tests
- setup_ec2

View file

@ -12,7 +12,7 @@
group/aws: group/aws:
aws_access_key: "{{ aws_access_key }}" aws_access_key: "{{ aws_access_key }}"
aws_secret_key: "{{ aws_secret_key }}" aws_secret_key: "{{ aws_secret_key }}"
security_token: "{{ security_token }}" security_token: "{{ security_token | default(omit) }}"
region: "{{ aws_region }}" region: "{{ aws_region }}"
block: block:
- include_tasks: cpu_options.yml - include_tasks: cpu_options.yml

View file

@ -7,7 +7,7 @@
group/aws: group/aws:
aws_access_key: "{{ aws_access_key }}" aws_access_key: "{{ aws_access_key }}"
aws_secret_key: "{{ aws_secret_key }}" aws_secret_key: "{{ aws_secret_key }}"
security_token: "{{ security_token }}" security_token: "{{ security_token | default(omit) }}"
region: "{{ aws_region }}" region: "{{ aws_region }}"
tasks: tasks:
- block: - block: