Merge "Cleanup for sriov-agent sriov-agent-required"
This commit is contained in:
commit
5f7f5b9e76
|
@ -107,12 +107,6 @@
|
||||||
# Repository. Should be an array of devices.
|
# Repository. Should be an array of devices.
|
||||||
# Defaults to ['15b3:1004', '8086:10ca'] (Intel & Mellanox SR-IOV capable NICs)
|
# Defaults to ['15b3:1004', '8086:10ca'] (Intel & Mellanox SR-IOV capable NICs)
|
||||||
#
|
#
|
||||||
# [*sriov_agent_required*]
|
|
||||||
# (optional) SRIOV neutron agent is required for port binding.
|
|
||||||
# Only set to true if SRIOV network adapters support VF link state setting
|
|
||||||
# and if admin state management is desired.
|
|
||||||
# Defaults to false.
|
|
||||||
#
|
|
||||||
# [*physical_network_mtus*]
|
# [*physical_network_mtus*]
|
||||||
# (optional) For L2 mechanism drivers, per-physical network MTU setting.
|
# (optional) For L2 mechanism drivers, per-physical network MTU setting.
|
||||||
# Should be an array with 'physnetX1:9000'.
|
# Should be an array with 'physnetX1:9000'.
|
||||||
|
@ -134,7 +128,12 @@
|
||||||
# the maximum MTU for the driver.
|
# the maximum MTU for the driver.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
|
# [*sriov_agent_required*]
|
||||||
|
# (optional) Deprecated.
|
||||||
|
# Defaults to undef.
|
||||||
|
#
|
||||||
class neutron::plugins::ml2 (
|
class neutron::plugins::ml2 (
|
||||||
$type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
|
$type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
|
||||||
$extension_drivers = $::os_service_default,
|
$extension_drivers = $::os_service_default,
|
||||||
|
@ -149,11 +148,12 @@ class neutron::plugins::ml2 (
|
||||||
$firewall_driver = $::os_service_default,
|
$firewall_driver = $::os_service_default,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$supported_pci_vendor_devs = ['15b3:1004', '8086:10ca'],
|
$supported_pci_vendor_devs = ['15b3:1004', '8086:10ca'],
|
||||||
$sriov_agent_required = false,
|
|
||||||
$physical_network_mtus = $::os_service_default,
|
$physical_network_mtus = $::os_service_default,
|
||||||
$path_mtu = 0,
|
$path_mtu = 0,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
$max_header_size = $::os_service_default
|
$max_header_size = $::os_service_default,
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
$sriov_agent_required = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include ::neutron::deps
|
||||||
|
@ -213,9 +213,12 @@ class neutron::plugins::ml2 (
|
||||||
max_header_size => $max_header_size
|
max_header_size => $max_header_size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $sriov_agent_required {
|
||||||
|
warning ('sriov_agent_required is deprecated, has no effect and will be removed in a future release.')
|
||||||
|
}
|
||||||
|
|
||||||
neutron::plugins::ml2::mech_driver { $mechanism_drivers:
|
neutron::plugins::ml2::mech_driver { $mechanism_drivers:
|
||||||
supported_pci_vendor_devs => $supported_pci_vendor_devs,
|
supported_pci_vendor_devs => $supported_pci_vendor_devs,
|
||||||
sriov_agent_required => $sriov_agent_required,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -23,12 +23,8 @@
|
||||||
# (required) Supported PCI vendor devices, defined by vendor_id:product_id according
|
# (required) Supported PCI vendor devices, defined by vendor_id:product_id according
|
||||||
# to the PCI ID Repository. Default enables support for Intel and Mellanox SR-IOV capable NICs
|
# to the PCI ID Repository. Default enables support for Intel and Mellanox SR-IOV capable NICs
|
||||||
#
|
#
|
||||||
# [*sriov_agent_required*]
|
|
||||||
# (optional) SRIOV neutron agent is always required for port binding
|
|
||||||
#
|
|
||||||
define neutron::plugins::ml2::mech_driver (
|
define neutron::plugins::ml2::mech_driver (
|
||||||
$supported_pci_vendor_devs,
|
$supported_pci_vendor_devs,
|
||||||
$sriov_agent_required = true,
|
|
||||||
){
|
){
|
||||||
|
|
||||||
include ::neutron::deps
|
include ::neutron::deps
|
||||||
|
@ -36,7 +32,6 @@ define neutron::plugins::ml2::mech_driver (
|
||||||
if ($name == 'sriovnicswitch') {
|
if ($name == 'sriovnicswitch') {
|
||||||
neutron_plugin_sriov {
|
neutron_plugin_sriov {
|
||||||
'ml2_sriov/supported_pci_vendor_devs': value => join(any2array($supported_pci_vendor_devs), ',');
|
'ml2_sriov/supported_pci_vendor_devs': value => join(any2array($supported_pci_vendor_devs), ',');
|
||||||
'ml2_sriov/agent_required': value => $sriov_agent_required;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -263,11 +263,9 @@ describe 'neutron::plugins::ml2' do
|
||||||
before :each do
|
before :each do
|
||||||
params.merge!(
|
params.merge!(
|
||||||
:mechanism_drivers => ['openvswitch', 'sriovnicswitch'],
|
:mechanism_drivers => ['openvswitch', 'sriovnicswitch'],
|
||||||
:sriov_agent_required => true,
|
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
it 'configures sriov mechanism driver with agent_enabled' do
|
it 'configures sriov mechanism driver' do
|
||||||
is_expected.to contain_neutron_plugin_sriov('ml2_sriov/agent_required').with_value('true')
|
|
||||||
is_expected.to contain_neutron_plugin_sriov('ml2_sriov/supported_pci_vendor_devs').with_value(['15b3:1004,8086:10ca'])
|
is_expected.to contain_neutron_plugin_sriov('ml2_sriov/supported_pci_vendor_devs').with_value(['15b3:1004,8086:10ca'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue