Add region to ansible-test AWS cloud config. (ansible#30733)

* Add region to ansible-test AWS cloud config. * Fix .gitignore for ansible-test cloud config.
dimagi · Sep 22, 2017 · ab89b1b · ab89b1b
1 parent 6d3307e
commit ab89b1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -72,7 +72,8 @@ Vagrantfile
 .vagrant
 ansible.egg-info/
 /shippable/
-/test/integration/cloud-config-azure.yml
+/test/integration/cloud-config-*.*
+!/test/integration/cloud-config-*.*.template
 # Release directory
 packaging/release/ansible_release
 /.cache/

diff --git a/test/integration/cloud-config-aws.yml.template b/test/integration/cloud-config-aws.yml.template
@@ -14,6 +14,8 @@
 aws_access_key: @ACCESS_KEY
 aws_secret_key: @SECRET_KEY
 security_token: @SECURITY_TOKEN
+aws_region: @REGION
 # aliases for backwards compatibility with older integration test playbooks
 ec2_access_key: '{{ aws_access_key }}'
 ec2_secret_key: '{{ aws_secret_key }}'
+ec2_region: '{{ aws_region }}'
diff --git a/test/runner/lib/cloud/aws.py b/test/runner/lib/cloud/aws.py
@@ -68,6 +68,7 @@ def _setup_dynamic(self):
                 ACCESS_KEY=credentials['access_key'],
                 SECRET_KEY=credentials['secret_key'],
                 SECURITY_TOKEN=credentials['session_token'],
+                REGION='us-east-1',
             )
 
             config = self._populate_config_template(config, values)