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

Fixing two bugs in the ec2_elb_lb module

Browse source 
* the current state of the ELB was not reflected properly when checking
  the status after a change was made.
* invalid zones caused a traceback when enabling/disabling zones
This commit is contained in:
James Cammarata 2014-05-05 12:48:45 -05:00
parent 19a77228d3
commit 4b2a56fb03
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
cloud/ec2_elb_lb
View file

@ -204,32 +204,37 @@ class ElbManager(object):
self._delete_elb() self._delete_elb()
def get_info(self): def get_info(self):
if not self.elb: try:
check_elb = self.elb_conn.get_all_load_balancers(self.name)[0]
except:
check_elb = None
if not check_elb:
info = { info = {
'name': self.name, 'name': self.name,
'status': self.status 'status': self.status
} }
else: else:
info = { info = {
'name': self.elb.name, 'name': check_elb.name,
'dns_name': self.elb.dns_name, 'dns_name': check_elb.dns_name,
'zones': self.elb.availability_zones, 'zones': check_elb.availability_zones,
'security_group_ids': self.elb.security_groups, 'security_group_ids': check_elb.security_groups,
'status': self.status 'status': self.status
} }
if self.elb.health_check: if check_elb.health_check:
info['health_check'] = { info['health_check'] = {
'target': self.elb.health_check.target, 'target': check_elb.health_check.target,
'interval': self.elb.health_check.interval, 'interval': check_elb.health_check.interval,
'timeout': self.elb.health_check.timeout, 'timeout': check_elb.health_check.timeout,
'healthy_threshold': self.elb.health_check.healthy_threshold, 'healthy_threshold': check_elb.health_check.healthy_threshold,
'unhealthy_threshold': self.elb.health_check.unhealthy_threshold, 'unhealthy_threshold': check_elb.health_check.unhealthy_threshold,
} }
if self.elb.listeners: if check_elb.listeners:
info['listeners'] = [l.get_complex_tuple() info['listeners'] = [l.get_complex_tuple()
for l in self.elb.listeners] for l in check_elb.listeners]
elif self.status == 'created': elif self.status == 'created':
# When creating a new ELB, listeners don't show in the # When creating a new ELB, listeners don't show in the
# immediately returned result, so just include the # immediately returned result, so just include the
@ -366,11 +371,23 @@ class ElbManager(object):
return tuple(listener_list) return tuple(listener_list)
def _enable_zones(self, zones): def _enable_zones(self, zones):
self.elb_conn.enable_availability_zones(self.name, zones) try:
self.elb.enable_zones(zones)
except boto.exception.BotoServerError, e:
if "Invalid Availability Zone" in e.error_message:
self.module.fail_json(msg=e.error_message)
else:
self.module.fail_json(msg="an unknown server error occurred, please try again later")
self.changed = True self.changed = True
def _disable_zones(self, zones): def _disable_zones(self, zones):
self.elb_conn.disable_availability_zones(self.name, zones) try:
self.elb.disable_zones(zones)
except boto.exception.BotoServerError, e:
if "Invalid Availability Zone" in e.error_message:
self.module.fail_json(msg=e.error_message)
else:
self.module.fail_json(msg="an unknown server error occurred, please try again later")
self.changed = True self.changed = True
def _set_zones(self): def _set_zones(self):