ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-21 20:30:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
* Add region to ansible-test AWS cloud config.
* Fix .gitignore for ansible-test cloud config.
This commit is contained in:
Matt Clay 2017-09-22 00:19:21 -07:00 • committed by GitHub
commit ab89b1b219
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -72,7 +72,8 @@ Vagrantfile
.vagrant .vagrant
ansible.egg-info/ ansible.egg-info/
/shippable/ /shippable/
/test/integration/cloud-config-azure.yml /test/integration/cloud-config-*.*
!/test/integration/cloud-config-*.*.template
# Release directory # Release directory
packaging/release/ansible_release packaging/release/ansible_release
/.cache/ /.cache/

2
test/integration/cloud-config-aws.yml.template
View file

@ -14,6 +14,8 @@
aws_access_key: @ACCESS_KEY aws_access_key: @ACCESS_KEY
aws_secret_key: @SECRET_KEY aws_secret_key: @SECRET_KEY
security_token: @SECURITY_TOKEN security_token: @SECURITY_TOKEN
aws_region: @REGION
# aliases for backwards compatibility with older integration test playbooks # aliases for backwards compatibility with older integration test playbooks
ec2_access_key: '{{ aws_access_key }}' ec2_access_key: '{{ aws_access_key }}'
ec2_secret_key: '{{ aws_secret_key }}' ec2_secret_key: '{{ aws_secret_key }}'
ec2_region: '{{ aws_region }}'

1
test/runner/lib/cloud/aws.py
View file

@ -68,6 +68,7 @@ class AwsCloudProvider(CloudProvider):
ACCESS_KEY=credentials['access_key'], ACCESS_KEY=credentials['access_key'],
SECRET_KEY=credentials['secret_key'], SECRET_KEY=credentials['secret_key'],
SECURITY_TOKEN=credentials['session_token'], SECURITY_TOKEN=credentials['session_token'],
REGION='us-east-1',
) )
config = self._populate_config_template(config, values) config = self._populate_config_template(config, values)