@@ -20,6 +20,7 @@

 # - init_neutron_third_party

 # - start_neutron_third_party

 # - create_nova_conf_neutron

+# - configure_neutron_after_post_config

 # - start_neutron_service_and_check

 # - check_neutron_third_party_integration

 # - start_neutron_agents

@@ -331,7 +332,6 @@ function configure_mutnauq {

     _configure_neutron_common

     iniset_rpc_backend neutron $NEUTRON_CONF

-    # goes before q-svc to init Q_SERVICE_PLUGIN_CLASSES

     if is_service_enabled q-metering; then

         _configure_neutron_metering

     fi

@@ -446,6 +446,13 @@ function install_neutron_agent_packages_mutnauq {

     fi

 }

+# Finish neutron configuration

+function configure_neutron_after_post_config {

+    if [[ $Q_SERVICE_PLUGIN_CLASSES != '' ]]; then

+        iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES

+    fi

+}

+

 # Start running processes, including screen

 function start_neutron_service_and_check {

     local service_port=$Q_PORT

@@ -794,10 +801,6 @@ function _configure_neutron_service {

     # Update either configuration file with plugin

     iniset $NEUTRON_CONF DEFAULT core_plugin $Q_PLUGIN_CLASS

-    if [[ $Q_SERVICE_PLUGIN_CLASSES != '' ]]; then

-        iniset $NEUTRON_CONF DEFAULT service_plugins $Q_SERVICE_PLUGIN_CLASSES

-    fi

-

     iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $NEUTRON_CONF oslo_policy policy_file $Q_POLICY_FILE

     iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP

@@ -1261,6 +1261,7 @@ if is_service_enabled neutron-api; then

     start_neutron_api

 elif is_service_enabled q-svc; then

     echo_summary "Starting Neutron"

+    configure_neutron_after_post_config

     start_neutron_service_and_check

 elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then

     NM_CONF=${NOVA_CONF}