1. devstack
  2. Commit a9286886e413fbf055284dc167a7640a5a79b83c
Browse code

Neutron: include metering service plugin in conf

The common code for metering calls _neutron_service_plugin_class_add,
which despite the description only just appends a service plugin to
$Q_SERVICE_PLUGIN_CLASSES - it doesn't actually write it into a
configuration file.

So for now, read out the configuration, and append metering to it, then
write it back out.

Change-Id: Ice96cca8b43dcd54f2aa81461000a4597db8260d

Sean M. Collins authored on 2016/06/21 02:23:11
Showing 1 changed files
lib/neutron
History View file @ a928688
... ... 
@@ -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 
 }