ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-04 23:39:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params

Browse source 
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
This commit is contained in:
James Cammarata 2014-02-26 09:37:26 -06:00
commit 8a7c68dc18
9 changed files with 55 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/ansible/module_utils/ec2.py
View file

@ -14,23 +14,32 @@ AWS_REGIONS = ['ap-northeast-1',
'us-west-2']
def ec2_argument_spec():
def ec2_argument_keys_spec():
return dict(
region=dict(aliases=['aws_region', 'ec2_region'], choices=AWS_REGIONS),
ec2_url=dict(),
ec2_secret_key=dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
ec2_access_key=dict(aliases=['aws_access_key', 'access_key']),
validate_certs=dict(default=True, type='bool'),
aws_secret_key=dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True),
aws_access_key=dict(aliases=['ec2_access_key', 'access_key']),
)
def ec2_argument_spec():
spec = ec2_argument_keys_spec()
spec.update(
dict(
region=dict(aliases=['aws_region', 'ec2_region'], choices=AWS_REGIONS),
validate_certs=dict(default=True, type='bool'),
ec2_url=dict(),
)
)
return spec
def get_ec2_creds(module):
# Check module args for credentials, then check environment vars
ec2_url = module.params.get('ec2_url')
ec2_secret_key = module.params.get('ec2_secret_key')
ec2_access_key = module.params.get('ec2_access_key')
ec2_secret_key = module.params.get('aws_secret_key')
ec2_access_key = module.params.get('aws_access_key')
region = module.params.get('region')
if not ec2_url: