diff options
| author | René Moser <mail@renemoser.net> | 2016-03-19 19:09:51 +0100 |
|---|---|---|
| committer | René Moser <mail@renemoser.net> | 2016-03-19 19:09:51 +0100 |
| commit | faf2bea527efe11bb70375bea1485d09669e8c44 (patch) | |
| tree | 7f5cc1ac5c4adb705e76a2d18ee2b4c827710ef6 | |
| parent | eaff7f5d1f4e3915eaf1a3d59795427c3d31ab2e (diff) | |
| parent | a34dae58cf488a46c7800a39aad3b236f94128ae (diff) | |
| download | ansible-modules-core-faf2bea527efe11bb70375bea1485d09669e8c44.tar.gz | |
Merge pull request #3261 from fabfuel/bugfix-ec2-elb-stickiness-without-expiration
Fixes #2039 Convert None to 0 when checking ELB cookie expiration
| -rw-r--r-- | cloud/amazon/ec2_elb_lb.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/amazon/ec2_elb_lb.py b/cloud/amazon/ec2_elb_lb.py index 65ab339d..faf99c6a 100644 --- a/cloud/amazon/ec2_elb_lb.py +++ b/cloud/amazon/ec2_elb_lb.py @@ -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 |