Add support for setting the Availability Zone to support AWS resource…

playbooks/roles/provision_aws/tasks/ec2.yml

@@ -3,6 +3,7 @@
 - name: Create master instance(s)
   ec2:
     region: "{{ aws_region }}"
+    zone: "{{ aws_zone }}"
     instance_type: "{{ ec2_instance_type_master }}"
     image: "{{ ec2_ami_ids[aws_region][ec2_ami_type] }}"
     key_name: "{{ ec2_key_name }}"
@@ -55,6 +56,7 @@
 - name: Create infra instance(s)
   ec2:
     region: "{{ aws_region }}"
+    zone: "{{ aws_zone }}"
     instance_type: "{{ ec2_instance_type_infra }}"
     image: "{{ ec2_ami_ids[aws_region][ec2_ami_type] }}"
     key_name: "{{ ec2_key_name }}"
@@ -103,6 +105,7 @@
 - name: Create app instance(s)
   ec2:
     region: "{{ aws_region }}"
+    zone: "{{ aws_zone }}"
     instance_type: "{{ ec2_instance_type_app }}"
     image: "{{ ec2_ami_ids[aws_region][ec2_ami_type] }}"
     key_name: "{{ ec2_key_name }}"

playbooks/roles/provision_aws/tasks/ec2_teardown.yml

@@ -6,6 +6,7 @@
     filters:
       tag:OpenShiftClusterName: "{{ cluster_name }}"
       tag:OpenShiftClusterNameVerbose: "{{ cluster_name_verbose }}"
+      availability-zone: "{{ aws_zone }}"
   register: ec2_find_instances
 
 - name: Delete elastic IPs for instances
@@ -19,6 +20,7 @@
 - name: Delete EC2 instances
   ec2_instance:
     region: "{{ aws_region }}"
+    availability_zone: "{{ aws_zone }}"
     filters:
       tag:OpenShiftClusterName: "{{ cluster_name }}"
       tag:OpenShiftClusterNameVerbose: "{{ cluster_name_verbose }}"

playbooks/roles/provision_aws/tasks/vpc.yml

@@ -56,6 +56,7 @@
   ec2_vpc_subnet:
     vpc_id: "{{ ec2_vpc_id }}"
     region: "{{ aws_region }}"
+    az: "{{ aws_zone }}"
     cidr: "{{ ec2_vpc_cidr_block }}"
     map_public: yes
     tags:

playbooks/roles/provision_aws/tasks/vpc_teardown.yml

@@ -25,6 +25,7 @@
   ec2_vpc_subnet:
     vpc_id: "{{ ec2_vpc_id }}"
     region: "{{ aws_region }}"
+    az: "{{ aws_zone }}"
     cidr: "{{ item.cidr_block }}"
     state: absent
   with_items: "{{ ec2_find_subnets.subnets }}"

vars/aws.example.yml

@@ -17,6 +17,8 @@ cert_email_address: [email protected]
 
 # The AWS region (i.e. `us-east-1`)
 aws_region: us-east-1
+# The AWS Availability Zone (i.e `us-east-1a`)
+aws_zone: us-east-1a
 # If you have Cloud Access setup for your account, set this to `cloud_access`. Otherwise, set this to `hourly`.
 ec2_ami_type: cloud_access
 # The ID of the Route53 hosted zone