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

Parameter and variable naming issues

Browse source
This commit is contained in:
John Jarvis 2013-05-03 06:55:06 -04:00
parent 8098b80e2d
commit 724c2f2709
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cloud/ec2_elb
View file

@ -21,8 +21,8 @@ short_description: De-registers or registers instances from EC2 ELB(s)
description: description:
- This module de-registers or registers an AWS EC2 instance from the ELB(s) - This module de-registers or registers an AWS EC2 instance from the ELB(s)
that it belongs to. that it belongs to.
- Returns fact "elb_ec2" which is a list of elbs attached the instance - Returns fact "ec2_elbs" which is a list of elbs attached to the instance
if deregister is called. if state=absent is passed as an argument.
- Will be marked changed when called only if there are ELBs found to operate on. - Will be marked changed when called only if there are ELBs found to operate on.
version_added: "1.2" version_added: "1.2"
requirements: [ "boto" ] requirements: [ "boto" ]
@ -40,7 +40,7 @@ options:
ec2_elbs: ec2_elbs:
description: description:
- List of ELB names, required for registration. The elb_ec2 fact should be used if there was a previous de-register. - List of ELB names, required for registration. The ec2_elbs fact should be used if there was a previous de-register.
required: false required: false
default: None default: None
ec2_secret_key: ec2_secret_key:
@ -134,7 +134,10 @@ class ElbManager:
time.sleep(1) time.sleep(1)
def _get_instance_lbs(self, ec2_elbs=None): def _get_instance_lbs(self, ec2_elbs=None):
"""Returns a list of ELBs attached to self.instance_id""" """Returns a list of ELBs attached to self.instance_id
ec2_elbs: an optional list of elb names that will be used
for elb lookup instead of returning what elbs
are attached to self.instance_id"""
try: try:
elb = boto.connect_elb(self.ec2_access_key, self.ec2_secret_key) elb = boto.connect_elb(self.ec2_access_key, self.ec2_secret_key)
@ -170,7 +173,7 @@ def main():
ec2_access_key = module.params['ec2_access_key'] ec2_access_key = module.params['ec2_access_key']
ec2_elbs = module.params['ec2_elbs'] ec2_elbs = module.params['ec2_elbs']
if module.params['state'] == 'register' and 'ec2_elbs' not in module.params: if module.params['state'] == 'present' and 'ec2_elbs' not in module.params:
module.fail_json(msg="ELBs are required for registration") module.fail_json(msg="ELBs are required for registration")
if not ec2_secret_key and 'EC2_SECRET_KEY' in os.environ: if not ec2_secret_key and 'EC2_SECRET_KEY' in os.environ:
@ -182,9 +185,9 @@ def main():
elb_man = ElbManager(module, instance_id, ec2_elbs, ec2_access_key, elb_man = ElbManager(module, instance_id, ec2_elbs, ec2_access_key,
ec2_secret_key) ec2_secret_key)
if module.params['state'] == 'register': if module.params['state'] == 'present':
elb_man.register() elb_man.register()
elif module.params['state'] == 'deregister': elif module.params['state'] == 'absent':
elb_man.deregister() elb_man.deregister()
ansible_facts = {'ec2_elbs': [lb.name for lb in elb_man.lbs]} ansible_facts = {'ec2_elbs': [lb.name for lb in elb_man.lbs]}