openstack
/
neutron
Code Issues Proposed changes

Merge "Fix LBaaS Haproxy occurs error if no member is added"

This commit is contained in:
Jenkins 2014-04-14 14:44:35 +00:00 committed by Gerrit Code Review
parent 26b2281dcc 0f2de5a335
commit 4cfb85f2c8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/services/loadbalancer/drivers/haproxy/cfg.py
View File

@ -199,7 +199,8 @@ def _get_session_persistence(config):
if persistence['type'] == constants.SESSION_PERSISTENCE_SOURCE_IP:
opts.append('stick-table type ip size 10k')
opts.append('stick on src')
elif persistence['type'] == constants.SESSION_PERSISTENCE_HTTP_COOKIE:
elif (persistence['type'] == constants.SESSION_PERSISTENCE_HTTP_COOKIE and
config.get('members')):
opts.append('cookie SRV insert indirect nocache')
elif (persistence['type'] == constants.SESSION_PERSISTENCE_APP_COOKIE and
persistence.get('cookie_name')):

8
neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_cfg.py
View File

@ -178,7 +178,15 @@ class TestHaproxyCfg(base.BaseTestCase):
self.assertEqual(cfg._get_session_persistence(config),
['stick-table type ip size 10k', 'stick on src'])
config = {'vip': {'session_persistence': {'type': 'HTTP_COOKIE'}},
'members': []}
self.assertEqual([], cfg._get_session_persistence(config))
config = {'vip': {'session_persistence': {'type': 'HTTP_COOKIE'}}}
self.assertEqual([], cfg._get_session_persistence(config))
config = {'vip': {'session_persistence': {'type': 'HTTP_COOKIE'}},
'members': [{'id': 'member1_id'}]}
self.assertEqual(cfg._get_session_persistence(config),
['cookie SRV insert indirect nocache'])