Merge "Neutron: include metering service plugin in conf"

2016-07-20 21:07:10 +00:00 · 2016-07-20 21:07:10 +00:00 · 61b319787b
commit 61b319787b
parent b54ba8fee5 a9286886e4
1 changed files with 6 additions and 0 deletions
--- a/lib/neutron
+++ b/lib/neutron
@ -245,6 +245,12 @@ function configure_neutron_new {
        source $TOP_DIR/lib/neutron_plugins/services/metering
        neutron_agent_metering_configure_common
        neutron_agent_metering_configure_agent
+        # TODO(sc68cal) hack because we don't pass around
+        # $Q_SERVICE_PLUGIN_CLASSES like -legacy does
+        local plugins=""
+        plugins=$(iniget $NEUTRON_CONF DEFAULT service_plugins)
+        plugins+=",metering"
+        iniset $NEUTRON_CONF DEFAULT service_plugins $plugins
    fi

 }