Merge "Ensure vnic_type_blacklist is unset by default"
This commit is contained in:
commit
46f21c95d1
|
@ -23,9 +23,14 @@ class neutron::plugins::ml2::ovs_driver (
|
||||||
$vnic_type_blacklist = [],
|
$vnic_type_blacklist = [],
|
||||||
){
|
){
|
||||||
|
|
||||||
|
validate_legacy(Array, 'validate_array', $vnic_type_blacklist)
|
||||||
if !empty($vnic_type_blacklist) {
|
if !empty($vnic_type_blacklist) {
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'ovs_driver/vnic_type_blacklist': value => join(any2array($vnic_type_blacklist), ',');
|
'ovs_driver/vnic_type_blacklist': value => join(any2array($vnic_type_blacklist), ',');
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
neutron_plugin_ml2 {
|
||||||
|
'ovs_driver/vnic_type_blacklist': value => $::os_service_default;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,9 +23,14 @@ class neutron::plugins::ml2::sriov_driver (
|
||||||
$vnic_type_blacklist= [],
|
$vnic_type_blacklist= [],
|
||||||
){
|
){
|
||||||
|
|
||||||
|
validate_legacy(Array, 'validate_array', $vnic_type_blacklist)
|
||||||
if !empty($vnic_type_blacklist) {
|
if !empty($vnic_type_blacklist) {
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'sriov_driver/vnic_type_blacklist': value => join(any2array($vnic_type_blacklist), ',');
|
'sriov_driver/vnic_type_blacklist': value => join(any2array($vnic_type_blacklist), ',');
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
neutron_plugin_ml2 {
|
||||||
|
'sriov_driver/vnic_type_blacklist': value => $::os_service_default;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,16 @@ require 'spec_helper'
|
||||||
describe 'neutron::plugins::ml2::ovs_driver' do
|
describe 'neutron::plugins::ml2::ovs_driver' do
|
||||||
|
|
||||||
shared_examples 'neutron::plugins::ml2::ovs_driver' do
|
shared_examples 'neutron::plugins::ml2::ovs_driver' do
|
||||||
|
context 'with defaults' do
|
||||||
|
let :params do
|
||||||
|
{}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should set the default values' do
|
||||||
|
should contain_neutron_plugin_ml2('ovs_driver/vnic_type_blacklist').with_value("<SERVICE DEFAULT>")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'when vnic_type_blacklist is not empty list' do
|
context 'when vnic_type_blacklist is not empty list' do
|
||||||
let :params do
|
let :params do
|
||||||
{ :vnic_type_blacklist => ['direct'] }
|
{ :vnic_type_blacklist => ['direct'] }
|
||||||
|
|
|
@ -17,6 +17,16 @@ require 'spec_helper'
|
||||||
describe 'neutron::plugins::ml2::sriov_driver' do
|
describe 'neutron::plugins::ml2::sriov_driver' do
|
||||||
|
|
||||||
shared_examples 'neutron::plugins::ml2::sriov_driver' do
|
shared_examples 'neutron::plugins::ml2::sriov_driver' do
|
||||||
|
context 'with defaults' do
|
||||||
|
let :params do
|
||||||
|
{}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should set the default values' do
|
||||||
|
should contain_neutron_plugin_ml2('sriov_driver/vnic_type_blacklist').with_value("<SERVICE DEFAULT>")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'when vnic_type_blacklist is not empty list' do
|
context 'when vnic_type_blacklist is not empty list' do
|
||||||
let :params do
|
let :params do
|
||||||
{ :vnic_type_blacklist => ['direct'] }
|
{ :vnic_type_blacklist => ['direct'] }
|
||||||
|
|
Loading…
Reference in New Issue