cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4787 from mohangk/devel

Browse source 
Fix: ec2_eip connect method references module var that is not passed in
This commit is contained in:
Michael DeHaan 2013-11-02 17:02:52 -07:00
commit 57a725fc16
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/cloud/ec2_eip
View file

@ -102,7 +102,7 @@ else:
boto_found = True boto_found = True
def connect(ec2_url, ec2_secret_key, ec2_access_key, region): def connect(ec2_url, ec2_secret_key, ec2_access_key, region, module):
""" Return an ec2 connection""" """ Return an ec2 connection"""
# allow environment variables to be used if ansible vars aren't set # allow environment variables to be used if ansible vars aren't set
if not ec2_url and 'EC2_URL' in os.environ: if not ec2_url and 'EC2_URL' in os.environ:
@ -258,14 +258,13 @@ def main():
if not boto_found: if not boto_found:
module.fail_json(msg="boto is required") module.fail_json(msg="boto is required")
# def get_ec2_creds(module):
# return ec2_url, ec2_access_key, ec2_secret_key, region
ec2_url, ec2_access_key, ec2_secret_key, region = get_ec2_creds(module) ec2_url, ec2_access_key, ec2_secret_key, region = get_ec2_creds(module)
ec2 = connect(ec2_url=ec2_url, ec2 = connect(ec2_url,
ec2_access_key=ec2_access_key, ec2_access_key,
ec2_secret_key=ec2_secret_key, ec2_secret_key,
region=region) region,
module)
instance_id = module.params.get('instance_id') instance_id = module.params.get('instance_id')
public_ip = module.params.get('public_ip') public_ip = module.params.get('public_ip')