Change standard AWS access and secret key parameter names to aws_access_key and aws_secret_key. Fixes an authentication problem with the rds module and standardizes the naming convention on something more encompassing than ec2_*_key.

This commit is contained in:
Scott Anderson 2014-02-08 18:35:26 -05:00
parent 3f2f5fec0a
commit baf508a379
9 changed files with 55 additions and 53 deletions

View file

@ -458,8 +458,8 @@ class ElastiCacheManager(object):
def main():
module = AnsibleModule(
argument_spec=dict(
argument_spec = ec2_argument_spec()
argument_spec.update(dict(
state={'required': True, 'choices': ['present', 'absent', 'rebooted']},
name={'required': True},
engine={'required': False, 'default': 'memcached'},
@ -470,19 +470,15 @@ def main():
cache_security_groups={'required': False, 'default': ['default'],
'type': 'list'},
zone={'required': False, 'default': None},
ec2_secret_key={'default': None,
'aliases': ['aws_secret_key', 'secret_key'],
'no_log': True},
ec2_access_key={'default': None,
'aliases': ['aws_access_key', 'access_key']},
region={'default': None, 'required': False,
'aliases': ['aws_region', 'ec2_region'],
'choices': AWS_REGIONS},
wait={'required': False, 'choices': BOOLEANS, 'default': True},
hard_modify={'required': False, 'choices': BOOLEANS, 'default': False}
)
)
module = AnsibleModule(
argument_spec=argument_spec,
)
ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)
name = module.params['name']