diff --git a/doc/config-reference/source/networking/networking_options_reference.rst b/doc/config-reference/source/networking/networking_options_reference.rst
index bd78e75e5a..bc43f00e19 100644
--- a/doc/config-reference/source/networking/networking_options_reference.rst
+++ b/doc/config-reference/source/networking/networking_options_reference.rst
@@ -64,11 +64,6 @@ IPv6 Prefix Delegation configuration options
.. include:: ../tables/neutron-pd_linux_agent.rst
-SR-IOV configuration options
-----------------------------
-
-.. include:: ../tables/neutron-sriov.rst
-
Modular Layer 2 (ml2) configuration options
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/config-reference/source/tables/neutron-sriov.rst b/doc/config-reference/source/tables/neutron-sriov.rst
deleted file mode 100644
index a3c3e29a89..0000000000
--- a/doc/config-reference/source/tables/neutron-sriov.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-..
- Warning: Do not edit this file. It is automatically generated from the
- software project's code and your changes will be overwritten.
-
- The tool to generate this file lives in openstack-doc-tools repository.
-
- Please make any changes needed in the code, then run the
- autogenerate-config-doc tool from the openstack-doc-tools repository, or
- ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _neutron-sriov:
-
-.. list-table:: Description of SR-IOV configuration options
- :header-rows: 1
- :class: config-ref-table
-
- * - Configuration option = Default value
- - Description
- * - **[SRIOV_NIC]**
- -
- * - ``exclude_devices`` =
- - (List) Comma-separated list of <network_device>:<vfs_to_exclude> tuples, mapping network_device to the agent's node-specific list of virtual functions that should not be used for virtual networking. vfs_to_exclude is a semicolon-separated list of virtual functions to exclude from network_device. The network_device in the mapping should appear in the physical_device_mappings list.
- * - ``physical_device_mappings`` =
- - (List) Comma-separated list of <physical_network>:<network_device> tuples mapping physical network names to the agent's node-specific physical network device interfaces of SR-IOV physical function to be used for VLAN networks. All physical networks listed in network_vlan_ranges on the server should have mappings to appropriate interfaces on each agent.
diff --git a/doc/networking-guide/source/adv-config-sriov.rst b/doc/networking-guide/source/adv-config-sriov.rst
index 878bfc2f98..5c5b54cc33 100644
--- a/doc/networking-guide/source/adv-config-sriov.rst
+++ b/doc/networking-guide/source/adv-config-sriov.rst
@@ -272,52 +272,6 @@ Configure nova-scheduler (Controller)
#. Now restart the nova-scheduler service with
:command:`service nova-scheduler restart`.
-
-Enable neutron sriov-agent (Compute)
-------------------------------------
-
-.. note::
-
- You only need to enable the sriov-agent if you decided to keep
- ``agent_required=True`` in the step :ref:`configure_sriov_neutron_server`.
- If you set ``agent_required=False``, you can safely skip this step.
-
-#. On each compute node edit the file
- ``/etc/neutron/plugins/ml2/sriov_agent.ini``:
-
- .. code-block:: ini
-
- [securitygroup]
- firewall_driver = neutron.agent.firewall.NoopFirewallDriver
-
- [sriov_nic]
- physical_device_mappings = physnet2:eth3
- exclude_devices =
-
- exclude_devices is empty so all the VFs associated with eth3 may be
- configured by the agent. If you want to exclude specific VFs, add
- them to the exclude_devices parameter as follows:
-
- .. code-block:: ini
-
- exclude_devices = eth1:0000:07:00.2; 0000:07:00.3, eth2:0000:05:00.1; 0000:05:00.2
-
-#. Test whether the sriov-agent runs successfully:
-
- .. code-block:: console
-
- # neutron-sriov-nic-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini
-
-#. Enable the neutron-sriov-agent to start automatically at system start.
- If your distribution does not come with a daemon file for your init
- system, create a daemon configuration file.
- For example on Ubuntu install the package:
-
- .. code-block:: console
-
- # apt-get install neutron-plugin-sriov-agent
-
-
Creating instances with SR-IOV ports
------------------------------------
After the configuration is done, you can now launch Instances
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index a0ea49b5e3..76391a5d42 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -246,8 +246,6 @@ QUOTAS/track_quota_usage quotas
SECURITYGROUP/enable_ipset securitygroups
SECURITYGROUP/enable_security_group securitygroups
SECURITYGROUP/firewall_driver securitygroups
-SRIOV_NIC/exclude_devices sriov
-SRIOV_NIC/physical_device_mappings sriov
VXLAN/arp_responder linuxbridge_agent
VXLAN/enable_vxlan linuxbridge_agent
VXLAN/l2_population linuxbridge_agent
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index ace13278a7..d1d543b58e 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -70,7 +70,6 @@ ryu RYU
sdnve SDN-VE
securitygroups security groups
service_auth LBaaS service authentication
-sriov SR-IOV
vpnaas VPN-as-a-Service
vpnaas_ipsec VPNaaS IPsec plug-in
vpnaas_libreswan VPNaaS libreSwan plug-in