diff options
author | Willem van Ketwich <willvk@gmail.com> | 2017-10-30 01:20:27 +0100 |
---|---|---|
committer | Will Thames <will@thames.id.au> | 2017-10-30 01:20:27 +0100 |
commit | 310eb833a4fff9c7f7ae8c4749a93ba5cefb3a1b (patch) | |
tree | 80376713b232b4481c6c758c4cc8696c5b4b2758 /test/integration/targets/ec2_ami | |
parent | subversion: PEP8 compliancy and doc fixes (#30909) (diff) | |
download | ansible-310eb833a4fff9c7f7ae8c4749a93ba5cefb3a1b.tar.xz ansible-310eb833a4fff9c7f7ae8c4749a93ba5cefb3a1b.zip |
EC2 AMI boto3 modifications (#28506)
Migrate ec2_ami module to boto3
Diffstat (limited to 'test/integration/targets/ec2_ami')
-rw-r--r-- | test/integration/targets/ec2_ami/tasks/main.yml | 2 | ||||
-rw-r--r-- | test/integration/targets/ec2_ami/vars/main.yml | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/test/integration/targets/ec2_ami/tasks/main.yml b/test/integration/targets/ec2_ami/tasks/main.yml index b29750a717..8d96e10599 100644 --- a/test/integration/targets/ec2_ami/tasks/main.yml +++ b/test/integration/targets/ec2_ami/tasks/main.yml @@ -66,7 +66,7 @@ key_name: '{{ setup_key.key.name }}' instance_type: t2.micro state: present - image: '{{ ec2_ami_image[ec2_region] }}' + image: '{{ ec2_region_images[ec2_region] }}' wait: yes instance_tags: '{{ec2_ami_name}}_instance_setup': 'integration_tests' diff --git a/test/integration/targets/ec2_ami/vars/main.yml b/test/integration/targets/ec2_ami/vars/main.yml index edb7a0b7cc..dac1fda2e9 100644 --- a/test/integration/targets/ec2_ami/vars/main.yml +++ b/test/integration/targets/ec2_ami/vars/main.yml @@ -1,2 +1,20 @@ --- # vars file for test_ec2_ami + +# based on Amazon Linux AMI 2017.09.0 (HVM), SSD Volume Type +ec2_region_images: + us-east-1: ami-8c1be5f6 + us-east-2: ami-c5062ba0 + us-west-1: ami-02eada62 + us-west-2: ami-e689729e + ca-central-1: ami-fd55ec99 + eu-west-1: ami-acd005d5 + eu-central-1: ami-c7ee5ca8 + eu-west-2: ami-1a7f6d7e + ap-southeast-1: ami-0797ea64 + ap-southeast-2: ami-8536d6e7 + ap-northeast-2: ami-9bec36f5 + ap-northeast-1: ami-2a69be4c + ap-south-1: ami-4fc58420 + sa-east-1: ami-f1344b9d + cn-north-1: ami-fba67596 |