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

Convert enabled value to boolean to actually work, make sure we can set expiration period to 0(None) to disable it

Browse source
This commit is contained in:
HAMSIK Adam 2015-08-06 16:51:36 +02:00 • committed by Matt Clay
parent bcae9a2b5e
commit 2af105bcbc
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
View file

@ -809,21 +809,25 @@ class ElbManager(object):
if self.stickiness['type'] == 'loadbalancer': if self.stickiness['type'] == 'loadbalancer':
policy = [] policy = []
policy_type = 'LBCookieStickinessPolicyType' policy_type = 'LBCookieStickinessPolicyType'
if self.stickiness['enabled'] == True:
if self.module.boolean(self.stickiness['enabled']) == True:
if 'expiration' not in self.stickiness: if 'expiration' not in self.stickiness:
self.module.fail_json(msg='expiration must be set when type is loadbalancer') self.module.fail_json(msg='expiration must be set when type is loadbalancer')
expiration = self.stickiness['expiration'] if self.stickiness['expiration'] is not 0 else None
policy_attrs = { policy_attrs = {
'type': policy_type, 'type': policy_type,
'attr': 'lb_cookie_stickiness_policies', 'attr': 'lb_cookie_stickiness_policies',
'method': 'create_lb_cookie_stickiness_policy', 'method': 'create_lb_cookie_stickiness_policy',
'dict_key': 'cookie_expiration_period', 'dict_key': 'cookie_expiration_period',
'param_value': self.stickiness['expiration'] 'param_value': expiration
} }
policy.append(self._policy_name(policy_attrs['type'])) policy.append(self._policy_name(policy_attrs['type']))
self._set_stickiness_policy(elb_info, listeners_dict, policy, **policy_attrs) self._set_stickiness_policy(elb_info, listeners_dict, policy, **policy_attrs)
elif self.stickiness['enabled'] == False: elif self.module.boolean(self.stickiness['enabled']) == False:
if len(elb_info.policies.lb_cookie_stickiness_policies): if len(elb_info.policies.lb_cookie_stickiness_policies):
if elb_info.policies.lb_cookie_stickiness_policies[0].policy_name == self._policy_name(policy_type): if elb_info.policies.lb_cookie_stickiness_policies[0].policy_name == self._policy_name(policy_type):
self.changed = True self.changed = True
@ -835,7 +839,7 @@ class ElbManager(object):
elif self.stickiness['type'] == 'application': elif self.stickiness['type'] == 'application':
policy = [] policy = []
policy_type = 'AppCookieStickinessPolicyType' policy_type = 'AppCookieStickinessPolicyType'
if self.stickiness['enabled'] == True: if self.module.boolean(self.stickiness['enabled']) == True:
if 'cookie' not in self.stickiness: if 'cookie' not in self.stickiness:
self.module.fail_json(msg='cookie must be set when type is application') self.module.fail_json(msg='cookie must be set when type is application')
@ -849,7 +853,7 @@ class ElbManager(object):
} }
policy.append(self._policy_name(policy_attrs['type'])) policy.append(self._policy_name(policy_attrs['type']))
self._set_stickiness_policy(elb_info, listeners_dict, policy, **policy_attrs) self._set_stickiness_policy(elb_info, listeners_dict, policy, **policy_attrs)
elif self.stickiness['enabled'] == False: elif self.module.boolean(self.stickiness['enabled']) == False:
if len(elb_info.policies.app_cookie_stickiness_policies): if len(elb_info.policies.app_cookie_stickiness_policies):
if elb_info.policies.app_cookie_stickiness_policies[0].policy_name == self._policy_name(policy_type): if elb_info.policies.app_cookie_stickiness_policies[0].policy_name == self._policy_name(policy_type):
self.changed = True self.changed = True