Add region to ansible-test AWS cloud config. (#30733)
* Add region to ansible-test AWS cloud config. * Fix .gitignore for ansible-test cloud config.
This commit is contained in:
parent
6d3307e472
commit
ab89b1b219
3 changed files with 5 additions and 1 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -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/
|
||||
|
|
|
@ -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 }}'
|
||||
|
|
|
@ -68,6 +68,7 @@ class AwsCloudProvider(CloudProvider):
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue