Skip to content

Commit

Permalink
aws region fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gustavomcarmo committed Feb 8, 2020
1 parent 6424e0a commit 66d294f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 5 additions & 2 deletions molecule/aws/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
tasks:
- name: Create security group
ec2_group:
region: "{{ molecule_yml.driver.region }}"
name: "{{ security_group_name }}"
description: "{{ security_group_name }}"
rules: "{{ security_group_rules }}"
Expand All @@ -46,12 +47,14 @@

- name: Delete remote keypair
ec2_key:
region: "{{ molecule_yml.driver.region }}"
name: "{{ keypair_name }}"
state: absent
when: not keypair_local.stat.exists

- name: Create keypair
ec2_key:
region: "{{ molecule_yml.driver.region }}"
name: "{{ keypair_name }}"
register: keypair

Expand All @@ -64,7 +67,7 @@

- name: Get the image ami
ec2_ami_info:
region: "{{ item.region }}"
region: "{{ molecule_yml.driver.region }}"
owners: "{{ item.image_owner }}"
filters:
name: "{{ item.image_name }}"
Expand All @@ -75,7 +78,7 @@
- name: Create molecule instance(s)
ec2:
key_name: "{{ keypair_name }}"
region: "{{ item.region }}"
region: "{{ molecule_yml.driver.region }}"
image: "{{ item.image
if item.image is defined
else (ec2_ami_facts.results[index].images | sort(attribute='creation_date', reverse=True))[0].image_id }}"
Expand Down
4 changes: 1 addition & 3 deletions molecule/aws/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@ dependency:
name: galaxy
driver:
name: ec2
region: eu-west-2
lint:
name: yamllint
platforms:
- name: monitor
region: eu-west-2
image_owner: 334305766942
image_name: codeyourinfra/monitor
instance_type: t2.micro
vpc_subnet_id: subnet-1cb17175
- name: server1
region: eu-west-2
image_owner: 099720109477
image_name: ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*
instance_type: t2.micro
vpc_subnet_id: subnet-1cb17175
groups:
- servers
- name: server2
region: eu-west-2
image_owner: 099720109477
image_name: ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*
instance_type: t2.micro
Expand Down

0 comments on commit 66d294f

Please sign in to comment.