Merge "Default LOG_COLOR based on interactive execution"
diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst
index 0ceb829..99681b3 100644
--- a/doc/source/plugin-registry.rst
+++ b/doc/source/plugin-registry.rst
@@ -110,6 +110,7 @@
nova-powervm `git://git.openstack.org/openstack/nova-powervm <https://git.openstack.org/cgit/openstack/nova-powervm>`__
octavia `git://git.openstack.org/openstack/octavia <https://git.openstack.org/cgit/openstack/octavia>`__
osprofiler `git://git.openstack.org/openstack/osprofiler <https://git.openstack.org/cgit/openstack/osprofiler>`__
+panko `git://git.openstack.org/openstack/panko <https://git.openstack.org/cgit/openstack/panko>`__
python-freezerclient `git://git.openstack.org/openstack/python-freezerclient <https://git.openstack.org/cgit/openstack/python-freezerclient>`__
rally `git://git.openstack.org/openstack/rally <https://git.openstack.org/cgit/openstack/rally>`__
sahara `git://git.openstack.org/openstack/sahara <https://git.openstack.org/cgit/openstack/sahara>`__
diff --git a/lib/neutron b/lib/neutron
index ba26c5f..ad68d8e 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -242,7 +242,7 @@
# Metering
if is_service_enabled neutron-metering; then
- source $TOP_DIR/neutron_plugins/services/metering
+ source $TOP_DIR/lib/neutron_plugins/services/metering
neutron_agent_metering_configure_common
neutron_agent_metering_configure_agent
fi
diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3
index 350aed8..0f0ed21 100644
--- a/lib/neutron_plugins/services/l3
+++ b/lib/neutron_plugins/services/l3
@@ -99,7 +99,7 @@
_neutron_setup_interface_driver $Q_L3_CONF_FILE
- neutron_plugin_configure_l3_agent
+ neutron_plugin_configure_l3_agent $Q_L3_CONF_FILE
_move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" True False "inet"