openstack/charm-neutron-api
Code Issues Proposed changes

Deal with juno/vxlan as well

Browse Source
This commit is contained in:
James Page 2015-05-06 12:40:21 +01:00
parent 8af5f23fb1
commit 39306764b3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/neutron_api_context.py
View File

@ -53,7 +53,7 @@ def get_dvr():
log('Disabling DVR, enable-dvr is not valid before Juno') log('Disabling DVR, enable-dvr is not valid before Juno')
return False return False
if os_release('neutron-server') == 'juno': if os_release('neutron-server') == 'juno':
if config('overlay-network-type') != VXLAN: if VXLAN not in config('overlay-network-type').split():
log('Disabling DVR, enable-dvr requires the use of the vxlan ' log('Disabling DVR, enable-dvr requires the use of the vxlan '
'overlay network for OpenStack Juno') 'overlay network for OpenStack Juno')
return False return False