saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

boto_elb: let connection errors bubble up

Browse source
This commit is contained in:
Matthew Williams 2015-04-13 22:11:12 +00:00
parent 66f3c413e3
commit 5d9a1f7f38
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
salt/modules/boto_elb.py
View file

@ -70,7 +70,6 @@ except ImportError:
# Import Salt libs
from salt.ext.six import string_types
import salt.utils.odict as odict
from salt.exceptions import CommandExecutionError
def __virtual__():
@ -114,10 +113,8 @@ def get_elb_config(name, region=None, key=None, keyid=None, profile=None):
salt myminion boto_elb.exists myelb region=us-east-1
'''
try:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
except CommandExecutionError:
return []
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
lb = conn.get_all_load_balancers(load_balancer_names=[name])
lb = lb[0]
@ -417,10 +414,8 @@ def get_attributes(name, region=None, key=None, keyid=None, profile=None):
salt myminion boto_elb.get_attributes myelb
'''
try:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
except CommandExecutionError:
return {}
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
lbattrs = conn.get_all_lb_attributes(name)
ret = odict.OrderedDict()
@ -525,10 +520,8 @@ def get_health_check(name, region=None, key=None, keyid=None, profile=None):
salt myminion boto_elb.get_health_check myelb
'''
try:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
except CommandExecutionError:
return {}
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
lb = conn.get_all_load_balancers(load_balancer_names=[name])
lb = lb[0]
@ -670,10 +663,7 @@ def get_instance_health(name, region=None, key=None, keyid=None, profile=None, i
salt myminion boto_elb.get_instance_health myelb
salt myminion boto_elb.get_instance_health myelb region=us-east-1 instances="[instance_id,instance_id]"
'''
try:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
except CommandExecutionError:
return []
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
instance_states = conn.describe_instance_health(name, instances)