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

@ -145,19 +145,18 @@ def commit(changes):
time.sleep(500)
def main():
module = AnsibleModule(
argument_spec = dict(
argument_spec = ec2_argument_keys_spec()
argument_spec.update(dict(
command = dict(choices=['get', 'create', 'delete'], required=True),
zone = dict(required=True),
record = dict(required=True),
ttl = dict(required=False, default=3600),
type = dict(choices=['A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS'], required=True),
value = dict(required=False),
ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True, required=False),
ec2_access_key = dict(aliases=['aws_access_key', 'access_key'], required=False),
overwrite = dict(required=False, type='bool')
)
)
module = AnsibleModule(argument_spec=argument_spec)
command_in = module.params.get('command')
zone_in = module.params.get('zone')