From 6d97f7c42a70f8c0bcad560e77f4d85374516b4b Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 6 Jul 2016 17:10:15 +0100 Subject: [PATCH] [network] Add missing sriov-agent config opts Commit '04cb819' incorrectly removed all documentation related to the sriov-agent. The only thing that has changed with this agent in recent releases is that it is now required, rather than optional. Some of this change has already been reverted in '04cb819'. Revert the remainder. Change-Id: I6bdd5b8d7e8850e23c3dd47161b2baee110b045b Related-bug: #1508557 --- .../networking_options_reference.rst | 5 ++++ .../source/tables/neutron-sriov_agent.rst | 24 +++++++++++++++++++ .../neutron.flagmappings | 2 ++ .../neutron.headers | 1 + 4 files changed, 32 insertions(+) create mode 100644 doc/config-reference/source/tables/neutron-sriov_agent.rst diff --git a/doc/config-reference/source/networking/networking_options_reference.rst b/doc/config-reference/source/networking/networking_options_reference.rst index 13d4be0c20..5a6c368737 100644 --- a/doc/config-reference/source/networking/networking_options_reference.rst +++ b/doc/config-reference/source/networking/networking_options_reference.rst @@ -153,6 +153,11 @@ Open vSwitch agent configuration options .. include:: ../tables/neutron-openvswitch_agent.rst +SR-IOV agent configuration options +---------------------------------- + +.. include:: ../tables/neutron-sriov_agent.rst + IPv6 Prefix Delegation configuration options -------------------------------------------- diff --git a/doc/config-reference/source/tables/neutron-sriov_agent.rst b/doc/config-reference/source/tables/neutron-sriov_agent.rst new file mode 100644 index 0000000000..e469f43eaa --- /dev/null +++ b/doc/config-reference/source/tables/neutron-sriov_agent.rst @@ -0,0 +1,24 @@ +.. + 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_agent.rst: + +.. 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 : 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 : 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/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings index 0652d2c1b7..12de7b717a 100644 --- a/tools/autogenerate-config-flagmappings/neutron.flagmappings +++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings @@ -244,6 +244,8 @@ QUOTAS/track_quota_usage quotas SECURITYGROUP/enable_ipset securitygroups SECURITYGROUP/enable_security_group securitygroups SECURITYGROUP/firewall_driver securitygroups +SRIOV_NIC/exclude_devices sriov_agent +SRIOV_NIC/physical_device_mappings sriov_agent 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 a83bc017a9..70dc20728b 100644 --- a/tools/autogenerate-config-flagmappings/neutron.headers +++ b/tools/autogenerate-config-flagmappings/neutron.headers @@ -70,6 +70,7 @@ ryu RYU sdnve SDN-VE securitygroups security groups service_auth LBaaS service authentication +sriov SR-IOV agent vpnaas VPN-as-a-Service vpnaas_ipsec VPNaaS IPsec plug-in vpnaas_libreswan VPNaaS libreSwan plug-in