commit 2000d0ccf3f97fb3e541b08eab55025b233a640c
author Zuul <zuul@review.opendev.org> Tue Nov 09 13:59:10 2021 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 09 13:59:10 2021 +0000
tree 4d48b72e6f2d42c84e93a0d428b79d683a0aaca1
parent d28865ba3d9d08da704f3c1318a76b98dab52608
parent 6839d42819c8349d8f1e72a58037198c97baca06

Merge "neutron-legacy: Remove no longer necessary vpnaas conditional"

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 7b20a96..704d2e8 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -552,11 +552,7 @@
 function start_mutnauq_other_agents {
     run_process q-dhcp "$AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file $Q_DHCP_CONF_FILE"
 
-    if is_service_enabled neutron-vpnaas; then
-        :  # Started by plugin
-    else
-        run_process q-l3 "$AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)"
-    fi
+    run_process q-l3 "$AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)"
 
     run_process q-meta "$AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file $Q_META_CONF_FILE"
     run_process q-metering "$AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"