diff --git a/etc/rootwrap.conf b/etc/rootwrap.conf
index 9cd93527fdb..b82fc7d83eb 100644
--- a/etc/rootwrap.conf
+++ b/etc/rootwrap.conf
@@ -28,10 +28,3 @@ syslog_log_level=ERROR
 
 # Rootwrap daemon exits after this seconds of inactivity
 daemon_timeout=600
-
-[xenapi]
-# XenAPI configuration is only required by the L2 agent if it is to
-# target a XenServer/XCP compute host's dom0.
-xenapi_connection_url=<None>
-xenapi_connection_username=root
-xenapi_connection_password=<None>
diff --git a/neutron/conf/agent/xenapi_conf.py b/neutron/conf/agent/xenapi_conf.py
index a77a5416b6b..6cbefb311dd 100644
--- a/neutron/conf/agent/xenapi_conf.py
+++ b/neutron/conf/agent/xenapi_conf.py
@@ -17,6 +17,7 @@ from oslo_config import cfg
 
 from neutron._i18n import _
 
+XENAPI_CONF_SECTION = 'xenapi'
 
 XENAPI_DEPRECATION_REASON = ('XenAPI support has been removed from Nova, it '
                              'will be removed in X.')
@@ -40,3 +41,7 @@ XENAPI_OPTS = [
                deprecated_since='Wallaby',
                deprecated_reason=XENAPI_DEPRECATION_REASON)
 ]
+
+
+def register_xenapi_opts(cfg=cfg.CONF):
+    cfg.register_opts(XENAPI_OPTS, group=XENAPI_CONF_SECTION)
diff --git a/neutron/opts.py b/neutron/opts.py
index 97df2f2ee45..7b044096b70 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -31,6 +31,7 @@ import neutron.conf.agent.linux
 import neutron.conf.agent.metadata.config as meta_conf
 import neutron.conf.agent.ovs_conf
 import neutron.conf.agent.ovsdb_api
+import neutron.conf.agent.xenapi_conf
 import neutron.conf.common
 import neutron.conf.db.dvr_mac_db
 import neutron.conf.db.extraroute_db
@@ -340,3 +341,10 @@ def list_ironic_auth_opts():
                 opt_list.append(plugin_option)
     opt_list.sort(key=operator.attrgetter('name'))
     return [(IRONIC_GROUP, opt_list)]
+
+
+def list_xenapi_opts():
+    return [
+        ('xenapi',
+         neutron.conf.agent.xenapi_conf.XENAPI_OPTS)
+    ]