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

Merge pull request #26527 from jfindlay/elb

Browse source 
check exists and values in boto_elb listeners
This commit is contained in:
Nicole Thomas 2015-08-21 09:27:52 -06:00
commit 1ac8287588
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/states/boto_elb.py
View file

@ -386,22 +386,19 @@ def _elb_present(
raise SaltInvocationError('Listeners must have at minimum port,'
' instance_port and protocol values in'
' the provided list.')
if 'elb_port' not in listener:
raise SaltInvocationError('elb_port is a required value for'
' listeners.')
if 'instance_port' not in listener:
raise SaltInvocationError('instance_port is a required value for'
' listeners.')
if 'elb_protocol' not in listener:
raise SaltInvocationError('elb_protocol is a required value for'
' listeners.')
for config in ('elb_port', 'instance_port', 'elb_protocol'):
if not listener.get(config):
raise SaltInvocationError(
'{0} is a required value for listeners.'.format(config)
)
listener['elb_protocol'] = listener['elb_protocol'].upper()
if listener['elb_protocol'] == 'HTTPS' and 'certificate' not in listener:
raise SaltInvocationError('certificate is a required value for'
' listeners if HTTPS is set for'
' elb_protocol.')
# We define all listeners as complex listeners.
if 'instance_protocol' not in listener:
if not listener.get('instance_protocol'):
listener['instance_protocol'] = listener['elb_protocol'].upper()
else:
listener['instance_protocol'] = listener['instance_protocol'].upper()