Merge "Revert "Use real Neutron network for L3 GW by default""
diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst
index 104fca6..38910b0 100644
--- a/doc/source/plugin-registry.rst
+++ b/doc/source/plugin-registry.rst
@@ -64,6 +64,7 @@
group-based-policy `git://git.openstack.org/openstack/group-based-policy <https://git.openstack.org/cgit/openstack/group-based-policy>`__
heat `git://git.openstack.org/openstack/heat <https://git.openstack.org/cgit/openstack/heat>`__
higgins `git://git.openstack.org/openstack/higgins <https://git.openstack.org/cgit/openstack/higgins>`__
+horizon-mellanox `git://git.openstack.org/openstack/horizon-mellanox <https://git.openstack.org/cgit/openstack/horizon-mellanox>`__
ironic `git://git.openstack.org/openstack/ironic <https://git.openstack.org/cgit/openstack/ironic>`__
ironic-inspector `git://git.openstack.org/openstack/ironic-inspector <https://git.openstack.org/cgit/openstack/ironic-inspector>`__
ironic-staging-drivers `git://git.openstack.org/openstack/ironic-staging-drivers <https://git.openstack.org/cgit/openstack/ironic-staging-drivers>`__
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
}