From f775bea0b10383be440ce9cd08960760f3c19421 Mon Sep 17 00:00:00 2001 From: Brian Schott Date: Thu, 17 Oct 2013 11:11:59 -0400 Subject: [PATCH] added aws_access_key and aws_secret_key aliases to ec2_group arguments --- cloud/ec2_group | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud/ec2_group b/cloud/ec2_group index 46f4a3fcebd..648f8f6cdf0 100644 --- a/cloud/ec2_group +++ b/cloud/ec2_group @@ -42,13 +42,13 @@ options: - EC2 secret key required: false default: null - aliases: [] + aliases: ['aws_secret_key'] ec2_access_key: description: - EC2 access key required: false default: null - aliases: [] + aliases: ['aws_access_key'] state: version_added: "1.4" description: @@ -110,8 +110,8 @@ def main(): vpc_id=dict(), rules=dict(), ec2_url=dict(aliases=['EC2_URL']), - ec2_secret_key=dict(aliases=['EC2_SECRET_KEY'], no_log=True), - ec2_access_key=dict(aliases=['EC2_ACCESS_KEY']), + ec2_secret_key=dict(aliases=['EC2_SECRET_KEY', 'aws_secret_key'], no_log=True), + ec2_access_key=dict(aliases=['EC2_ACCESS_KEY', 'aws_access_key']), region=dict(choices=['eu-west-1', 'sa-east-1', 'us-east-1', 'ap-northeast-1', 'us-west-2', 'us-west-1', 'ap-southeast-1', 'ap-southeast-2']), state = dict(default='present', choices=['present', 'absent']), ),