Merge pull request #4789 from mohangk/devel

Fix for connect method parameter order
2013-11-03 08:49:00 -08:00 · 2013-11-03 08:49:00 -08:00 · 6e6884d6e0
parent 49c86bc24b 56bd9a14d5
commit 6e6884d6e0
1 changed files with 2 additions and 1 deletions
--- a/library/cloud/ec2_eip
+++ b/library/cloud/ec2_eip
@ -102,7 +102,8 @@ else:
    boto_found = True


-def connect(ec2_url, ec2_secret_key, ec2_access_key, region, module):
+def connect(ec2_url, ec2_access_key, ec2_secret_key, region, module):
+
    """ Return an ec2 connection"""
    # allow environment variables to be used if ansible vars aren't set
    if not ec2_url and 'EC2_URL' in os.environ: