diff --git a/setup.cfg b/setup.cfg
index f88a79b5..c9cffb85 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -149,6 +149,23 @@ oslo.messaging.notify.drivers =
     neutron.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver
     neutron.openstack.common.notifier.rpc_notifier2 = oslo_messaging.notify.messaging:MessagingV2Driver
     neutron.openstack.common.notifier.rpc_notifier = oslo_messaging.notify.messaging:MessagingDriver
+oslo.config.opts =
+    neutron = neutron.opts:list_opts
+    neutron.agent = neutron.opts:list_agent_opts
+    neutron.base.agent = neutron.opts:list_base_agent_opts
+    neutron.db = neutron.opts:list_db_opts
+    neutron.dhcp.agent = neutron.opts:list_dhcp_agent_opts
+    neutron.extensions = neutron.opts:list_extension_opts
+    neutron.l3.agent = neutron.opts:list_l3_agent_opts
+    neutron.metadata.agent = neutron.opts:list_metadata_agent_opts
+    neutron.metering.agent = neutron.opts:list_metering_agent_opts
+    neutron.ml2 = neutron.opts:list_ml2_conf_opts
+    neutron.ml2.linuxbridge.agent = neutron.opts:list_linux_bridge_opts
+    neutron.ml2.ovs.agent = neutron.opts:list_ovs_opts
+    neutron.ml2.sriov = neutron.opts:list_ml2_conf_sriov_opts
+    neutron.ml2.sriov.agent = neutron.opts:list_sriov_agent_opts
+    neutron.qos = neutron.opts:list_qos_opts
+    nova.auth = neutron.opts:list_auth_opts
 neutron.db.alembic_migrations =
     neutron = neutron.db.migration:alembic_migrations
 neutron.interface_drivers =