@@ -90,6 +90,10 @@ function is_neutron_legacy_enabled {

     return 1

 }

+if is_neutron_legacy_enabled; then

+    source $TOP_DIR/lib/neutron-legacy

+fi

+

 # cleanup_neutron() - Remove residual data files, anything left over from previous

 # runs that a clean run would need to clean up

 function cleanup_neutron_new {

@@ -568,6 +572,15 @@ function neutron_service_plugin_class_add {

     fi

 }

+function install_neutron_agent_packages {

+    if is_neutron_legacy_enabled; then

+        # Call back to old function

+        install_neutron_agent_packages_mutnauq "$@"

+    else

+        :

+    fi

+}

+

 function start_neutron {

     if is_neutron_legacy_enabled; then

         # Call back to old function

@@ -423,7 +423,7 @@ function install_mutnauq {

 }

 # install_neutron_agent_packages() - Collect source and prepare

-function install_neutron_agent_packages {

+function install_neutron_agent_packages_mutnauq {

     # radvd doesn't come with the OS. Install it if the l3 service is enabled.

     if is_service_enabled q-l3; then

         install_package radvd

@@ -574,7 +574,6 @@ source $TOP_DIR/lib/cinder

 source $TOP_DIR/lib/swift

 source $TOP_DIR/lib/heat

 source $TOP_DIR/lib/neutron

-source $TOP_DIR/lib/neutron-legacy

 source $TOP_DIR/lib/ldap

 source $TOP_DIR/lib/dstat

 source $TOP_DIR/lib/dlm

@@ -68,7 +68,6 @@ source $TOP_DIR/lib/cinder

 source $TOP_DIR/lib/swift

 source $TOP_DIR/lib/heat

 source $TOP_DIR/lib/neutron

-source $TOP_DIR/lib/neutron-legacy

 source $TOP_DIR/lib/ldap

 source $TOP_DIR/lib/dstat

 source $TOP_DIR/lib/dlm