Browse code

Merge "Neutron: include metering service plugin in conf"

Jenkins authored on 2016/07/21 06:07:10
Showing 1 changed files
... ...
@@ -245,6 +245,12 @@ function configure_neutron_new {
245 245
         source $TOP_DIR/lib/neutron_plugins/services/metering
246 246
         neutron_agent_metering_configure_common
247 247
         neutron_agent_metering_configure_agent
248
+        # TODO(sc68cal) hack because we don't pass around
249
+        # $Q_SERVICE_PLUGIN_CLASSES like -legacy does
250
+        local plugins=""
251
+        plugins=$(iniget $NEUTRON_CONF DEFAULT service_plugins)
252
+        plugins+=",metering"
253
+        iniset $NEUTRON_CONF DEFAULT service_plugins $plugins
248 254
     fi
249 255
 
250 256
 }