openstack/charm-neutron-gateway
Code Issues Proposed changes

OVS ODL always uses l3-agent

Browse Source 
The change in:

  If1bc6151e8bb9b23eaac94662f4d18ff63040af2

accidentally switch the charm to use the neutron-vpn-agent for OVSi
ODL deployments; this is incorrect and breaks functional tests in
the odl-controller charm.

Moved the logic that switches l3->vpn back into OVS plugin mode
only so that OVS ODL uses l3-agent always.

Change-Id: I968a09217a5058191509650d080752d2a4aa1455
This commit is contained in:
James Page 2016-10-12 17:34:47 +01:00
parent b77fc3b1a5
commit 25030b687b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hooks/neutron_utils.py
View File

@ -270,6 +270,13 @@ def get_packages():
packages = deepcopy(GATEWAY_PKGS[plugin])
source = os_release('neutron-common')
if plugin == OVS:
if (source >= 'icehouse' and
lsb_release()['DISTRIB_CODENAME'] < 'utopic'):
# NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for
# icehouse but openswan was removed in utopic.
packages.remove('neutron-l3-agent')
packages.append('neutron-vpn-agent')
packages.append('openswan')
if source >= 'liberty':
# Switch out mysql driver
packages.remove('python-mysqldb')
@ -278,16 +285,9 @@ def get_packages():
# Switch out to actual ovs agent package
packages.remove('neutron-plugin-openvswitch-agent')
packages.append('neutron-openvswitch-agent')
if plugin in (OVS, OVS_ODL):
if (source >= 'icehouse' and
lsb_release()['DISTRIB_CODENAME'] < 'utopic'):
# NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for
# icehouse but openswan was removed in utopic.
packages.remove('neutron-l3-agent')
packages.append('neutron-vpn-agent')
packages.append('openswan')
if source >= 'kilo':
packages.append('python-neutron-fwaas')
if plugin in (OVS, OVS_ODL):
if source >= 'newton':
# LBaaS v1 dropped in newton
packages.remove('neutron-lbaas-agent')