openstack/charm-neutron-gateway
Code Issues Proposed changes

Ensure neutron-vpn-agent not used in Trusty Mitaka

Browse Source 
The neutron-vpn-agent package was deprecated some time
ago and Xenial Mitaka install will use the
neutron-l3-agent package where as Trusty Mitaka will
erroneously install neutron-vpn-agent.

Change-Id: Ibfb53851683a685b252174504cbe2efaf43e6e9d
Closes-Bug: #1761514
This commit is contained in:
Edward Hope-Morley 2018-04-05 15:24:31 +01:00
parent 9d460582bf
commit 1eec99ada2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/neutron_utils.py
View File

@ -222,7 +222,8 @@ def get_packages():
cmp_os_source = CompareOpenStackReleases(os_release('neutron-common'))
cmp_host_release = CompareHostReleases(lsb_release()['DISTRIB_CODENAME'])
if plugin == OVS:
if cmp_os_source >= 'icehouse' and cmp_host_release < 'utopic':
if (cmp_os_source >= 'icehouse' and cmp_os_source < 'mitaka' and
cmp_host_release < 'utopic'):
# NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for
# icehouse but openswan was removed in utopic.
packages.remove('neutron-l3-agent')

1
tests/basic_deployment.py
View File

@ -180,6 +180,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
if self._get_openstack_release() <= self.trusty_icehouse:
neutron_services.append('neutron-vpn-agent')
if self._get_openstack_release() >= self.trusty_mitaka:
neutron_services.append('neutron-l3-agent')
# neutron-plugin-openvswitch-agent -> neutron-openvswitch-agent
neutron_services.remove('neutron-plugin-openvswitch-agent')
neutron_services.append('neutron-openvswitch-agent')