openstack
/
charm-neutron-api
Code Issues Proposed changes

Enable use of DVR+L3HA together for Newton and up 

This combination is supported since Newton. Additionally this
enables use of l2-population with L3HA since Newton.

Change-Id: Ifd7411ac8e0e24d95da791a36b2f523b34ded2a4
Closes-Bug: #1681891
This commit is contained in:
Corey Bryant 2017-05-31 13:30:39 -04:00
parent 6c6224b890
commit 663b614c6d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/neutron_api_context.py
View File

@ -101,10 +101,11 @@ def get_tenant_network_types():
def get_l3ha():
if config('enable-l3ha'):
if CompareOpenStackReleases(os_release('neutron-server')) < 'juno':
release = os_release('neutron-server')
if CompareOpenStackReleases(release) < 'juno':
log('Disabling L3 HA, enable-l3ha is not valid before Juno')
return False
if get_l2population():
if CompareOpenStackReleases(release) < 'newton' and get_l2population():
log('Disabling L3 HA, l2-population must be disabled with L3 HA')
return False
return True
@ -123,7 +124,7 @@ def get_dvr():
log('Disabling DVR, enable-dvr requires the use of the vxlan '
'overlay network for OpenStack Juno')
return False
if get_l3ha():
if get_l3ha() and CompareOpenStackReleases(release) < 'newton':
log('Disabling DVR, enable-l3ha must be disabled with dvr')
return False
if not get_l2population():