Merge pull request #3261 from fabfuel/bugfix-ec2-elb-stickiness-without-expiration

Fixes #2039 Convert None to 0 when checking ELB cookie expiration
This commit is contained in:
René Moser 2016-03-19 19:09:51 +01:00
commit faf2bea527

View file

@ -888,7 +888,7 @@ class ElbManager(object):
def _set_stickiness_policy(self, elb_info, listeners_dict, policy, **policy_attrs):
for p in getattr(elb_info.policies, policy_attrs['attr']):
if str(p.__dict__['policy_name']) == str(policy[0]):
if str(p.__dict__[policy_attrs['dict_key']]) != str(policy_attrs['param_value']):
if str(p.__dict__[policy_attrs['dict_key']]) != str(policy_attrs['param_value'] or 0):
self._set_listener_policy(listeners_dict)
self._update_policy(policy_attrs['param_value'], policy_attrs['method'], policy_attrs['attr'], policy[0])
self.changed = True