Merge pull request #5880 from willthames/ec2_modules_refactor

Create a common EC2 connection argument spec for EC2 modules
This commit is contained in:
jctanner 2014-02-06 11:08:09 -05:00
commit 0bc0315171
8 changed files with 40 additions and 45 deletions

View file

@ -8,6 +8,15 @@ AWS_REGIONS = ['ap-northeast-1',
'us-west-2']
def ec2_argument_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']),
)
def get_ec2_creds(module):
# Check module args for credentials, then check environment vars