commit c714c7e962f35043bc36eb4e6a93df69e477179d
author Jenkins <jenkins@review.openstack.org> Thu Jul 21 19:17:22 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jul 21 19:17:22 2016 +0000
tree 6bbf3f0b0ef87d939e19d29e6f8f9bf7ece42694
parent 61b319787bbd0af7f3cc1feb71cef0bef6dab373
parent 130a11f8aaf08ea529b6ce60dd9052451cb7bb5c

Merge "Use real Neutron network for L3 GW by default"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index ad68d8e..5cab8e1 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -245,6 +245,12 @@
         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
 
 }