mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
convert boto_elb BaseException.message
This commit is contained in:
Justin Findlay
parent
095c09d828
commit
742b8deec6
1 changed files with 44 additions and 44 deletions
|
|
@ -87,8 +87,8 @@ def exists(name, region=None, key=None, keyid=None, profile=None):
|
|||
msg = 'The load balancer does not exist in region {0}'.format(region)
|
||||
log.debug(msg)
|
||||
return False
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
return False
|
||||
|
||||
|
||||
|
|
@ -125,8 +125,8 @@ def get_elb_config(name, region=None, key=None, keyid=None, profile=None):
|
|||
ret['scheme'] = lb.scheme
|
||||
ret['dns_name'] = lb.dns_name
|
||||
return ret
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
return []
|
||||
|
||||
|
||||
|
|
@ -174,9 +174,9 @@ def create(name, availability_zones, listeners=None, subnets=None,
|
|||
msg = 'Failed to create ELB {0}'.format(name)
|
||||
log.error(msg)
|
||||
return False
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to create ELB {0}: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to create ELB {0}: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -199,8 +199,8 @@ def delete(name, region=None, key=None, keyid=None, profile=None):
|
|||
msg = 'Deleted ELB {0}.'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to delete ELB {0}'.format(name)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
|
@ -239,9 +239,9 @@ def create_listeners(name, listeners=None, region=None, key=None, keyid=None,
|
|||
msg = 'Created ELB listeners on {0}'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to create ELB listeners on {0}: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to create ELB listeners on {0}: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -265,9 +265,9 @@ def delete_listeners(name, ports, region=None, key=None, keyid=None,
|
|||
msg = 'Deleted ELB listeners on {0}'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to delete ELB listeners on {0}: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to delete ELB listeners on {0}: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -291,9 +291,9 @@ def enable_availability_zones(name, availability_zones, region=None, key=None,
|
|||
msg = 'Enabled availability_zones on ELB {0}'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to enable availability_zones on ELB {0}: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to enable availability_zones on ELB {0}: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -317,9 +317,9 @@ def disable_availability_zones(name, availability_zones, region=None, key=None,
|
|||
msg = 'Disabled availability_zones on ELB {0}'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to disable availability_zones on ELB {0}: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to disable availability_zones on ELB {0}: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -343,9 +343,9 @@ def attach_subnets(name, subnets, region=None, key=None, keyid=None,
|
|||
msg = 'Attached ELB {0} on subnets.'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to attach ELB {0} on subnets: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to attach ELB {0} on subnets: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -369,9 +369,9 @@ def detach_subnets(name, subnets, region=None, key=None, keyid=None,
|
|||
msg = 'Detached ELB {0} from subnets.'.format(name)
|
||||
log.info(msg)
|
||||
return True
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
msg = 'Failed to detach ELB {0} from subnets: {1}'.format(name, e.message)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
msg = 'Failed to detach ELB {0} from subnets: {1}'.format(name, error)
|
||||
log.error(msg)
|
||||
return False
|
||||
|
||||
|
|
@ -404,9 +404,9 @@ def get_attributes(name, region=None, key=None, keyid=None, profile=None):
|
|||
ret['connection_draining']['enabled'] = cd.enabled
|
||||
ret['connection_draining']['timeout'] = cd.timeout
|
||||
return ret
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
log.error('ELB {0} does not exist: {1}'.format(name, e.message))
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
log.error('ELB {0} does not exist: {1}'.format(name, error))
|
||||
return {}
|
||||
|
||||
|
||||
|
|
@ -492,9 +492,9 @@ def get_health_check(name, region=None, key=None, keyid=None, profile=None):
|
|||
ret['timeout'] = hc.timeout
|
||||
ret['unhealthy_threshold'] = hc.unhealthy_threshold
|
||||
return ret
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
log.error('ELB {0} does not exist: {1}'.format(name, e.message))
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
log.error('ELB {0} does not exist: {1}'.format(name, error))
|
||||
return {}
|
||||
|
||||
|
||||
|
|
@ -514,9 +514,9 @@ def set_health_check(name, health_check, region=None, key=None, keyid=None,
|
|||
try:
|
||||
conn.configure_health_check(name, hc)
|
||||
log.info('Configured health check on ELB {0}'.format(name))
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
log.info('Failed to configure health check on ELB {0}: {1}'.format(name, e.message))
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
log.info('Failed to configure health check on ELB {0}: {1}'.format(name, error))
|
||||
return False
|
||||
return True
|
||||
|
||||
|
|
@ -546,8 +546,8 @@ def register_instances(name, instances, region=None, key=None, keyid=None,
|
|||
return False
|
||||
try:
|
||||
registered_instances = conn.register_instances(name, instances)
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.warn(e)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.warn(error)
|
||||
return False
|
||||
registered_instance_ids = [instance.id for instance in
|
||||
registered_instances]
|
||||
|
|
@ -589,18 +589,18 @@ def deregister_instances(name, instances, region=None, key=None, keyid=None,
|
|||
return False
|
||||
try:
|
||||
registered_instances = conn.deregister_instances(name, instances)
|
||||
except boto.exception.BotoServerError as e:
|
||||
except boto.exception.BotoServerError as error:
|
||||
# if the instance(s) given as an argument are not members of the ELB
|
||||
# boto returns e.error_code == 'InvalidInstance'
|
||||
# boto returns error.error_code == 'InvalidInstance'
|
||||
# deregister_instances returns "None" because the instances are
|
||||
# effectively deregistered from ELB
|
||||
if e.error_code == 'InvalidInstance':
|
||||
if error.error_code == 'InvalidInstance':
|
||||
log.warn('One or more of instance(s) {0} are not part of ELB {1}.'
|
||||
' deregister_instances not performed.'
|
||||
.format(instances, name))
|
||||
return None
|
||||
else:
|
||||
log.warn(e)
|
||||
log.warn(error)
|
||||
return False
|
||||
registered_instance_ids = [instance.id for instance in
|
||||
registered_instances]
|
||||
|
|
@ -638,8 +638,8 @@ def get_instance_health(name, region=None, key=None, keyid=None, profile=None, i
|
|||
'reason_code': _instance.reason_code
|
||||
})
|
||||
return ret
|
||||
except boto.exception.BotoServerError as e:
|
||||
log.debug(e)
|
||||
except boto.exception.BotoServerError as error:
|
||||
log.debug(error)
|
||||
return []
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue