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

README.md

@@ -86,6 +86,7 @@ AWS provisioner.
 | `openshift_base_domain`          | :heavy_check_mark: |                                      | The base subdomain to use for your cluster.<br><br>Example: If you set this to `example.com`, a DNS entry for `<cluster_name>.example.com` will be created)                                                                   |
 | `cert_email_address`             | :heavy_check_mark: |                                      | The email address to use when generating Lets Encrypt certs for the cluster.                                                                                                                                                  |
 | `aws_region`                     | :heavy_check_mark: |                                      | The AWS region (i.e. `us-east-1`)                                                                                                                                                                                             |
+| `aws_zone`                       |                    |                                      | The AWS availability zone (i.e. `us-east-1a`)                                                                                                                                                                                             |
 | `ec2_ami_type`                   | :heavy_check_mark: | `hourly`                             | If you have Cloud Access setup for your account, set this to `cloud_access`. Otherwise, set this to `hourly`.                                                                                                                 |
 | `route53_hosted_zone_id`         | :heavy_check_mark: |                                      | The ID of the Route53 hosted zone (i.e. `YP563J79RELJ4C`)                                                                                                                                                                     |
 | `rhsm_username`                  | :heavy_check_mark: |                                      | Your RHSM username                                                                                                                                                                                                            |
@@ -267,4 +268,3 @@ sudo ./op.py --env-file vars/aws.env --vars-file vars/aws.yml teardown
 By default this tool uses the released versions of the repo playbooks. If you want to tweak anything locally and have the `op.py` script uses those changes you can. Be sure to pass `--dev` on the command line for those local changes to be used.
 
 For more info please see the [CONTRIBUTING.md](./CONTRIBUTING.md) guidelines
-

playbooks/roles/provision_aws/tasks/ec2.yml

@@ -3,6 +3,7 @@
 - name: Create master instance(s)
   ec2:
     region: "{{ aws_region }}"
+    zone: "{{ aws_zone | default(omit) }}"
     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 | default(omit) }}"
     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 | default(omit) }}"
     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/vpc.yml

@@ -56,6 +56,7 @@
   ec2_vpc_subnet:
     vpc_id: "{{ ec2_vpc_id }}"
     region: "{{ aws_region }}"
+    az: "{{ aws_zone | default(omit) }}"
     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 | default(omit) }}"
     cidr: "{{ item.cidr_block }}"
     state: absent
   with_items: "{{ ec2_find_subnets.subnets }}"