From: Ihar Hrachyshka Date: Wed, 26 Aug 2015 15:12:59 +0000 (+0200) Subject: Split SR-IOV configuration file into driver and agent pieces X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8200439fa0f797e814cfa1f51d5cf7a86d42f4a0;p=openstack-build%2Fneutron-build.git Split SR-IOV configuration file into driver and agent pieces This is the same as we do for linuxbridge or openvswitch. We should not expose server-only configuration options to the agent, and vice versa. DocImpact Closes-Bug: #1489060 Change-Id: Ie1eda925e051f85d53ad9624d6617d095cf8c7be --- diff --git a/etc/neutron/plugins/ml2/ml2_conf_sriov.ini b/etc/neutron/plugins/ml2/ml2_conf_sriov.ini index 3d02cb043..a39b61e6e 100644 --- a/etc/neutron/plugins/ml2/ml2_conf_sriov.ini +++ b/etc/neutron/plugins/ml2/ml2_conf_sriov.ini @@ -1,5 +1,4 @@ # Defines configuration options for SRIOV NIC Switch MechanismDriver -# and Agent [ml2_sriov] # (ListOpt) Comma-separated list of @@ -13,22 +12,3 @@ # DEPRECATED: This option is deprecated in the Liberty release # and will be removed in the Mitaka release. From Mitaka the agent will # always be required. - -[sriov_nic] -# (ListOpt) 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. -# -# physical_device_mappings = -# Example: physical_device_mappings = physnet1:eth1 -# -# (ListOpt) 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. -# exclude_devices = -# Example: exclude_devices = eth1:0000:07:00.2; 0000:07:00.3 diff --git a/etc/neutron/plugins/ml2/sriov_agent.ini b/etc/neutron/plugins/ml2/sriov_agent.ini new file mode 100644 index 000000000..8866f2677 --- /dev/null +++ b/etc/neutron/plugins/ml2/sriov_agent.ini @@ -0,0 +1,20 @@ +# Defines configuration options for SRIOV NIC Switch Agent + +[sriov_nic] +# (ListOpt) 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. +# +# physical_device_mappings = +# Example: physical_device_mappings = physnet1:eth1 +# +# (ListOpt) 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. +# exclude_devices = +# Example: exclude_devices = eth1:0000:07:00.2; 0000:07:00.3