openstack
/
puppet-ovn
Code Issues Proposed changes

Ensure ovn-bridge-datapath-type is removed by default 

This is follow-up of 5c809de016 and
ensures the ovn-bridge-datapath-type option is removed by default.
Current Puppet does not ensure the value in case a nil value is passed
thus setting value => undef has no effect.

Change-Id: Ia7e85756882606912e06a6742cd35517b568dffe
This commit is contained in:
Takashi Kajinami 2022-08-05 13:54:04 +09:00
parent 4f58f3ccd3
commit 59ffa355e9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/controller.pp
View File

@ -119,7 +119,7 @@ class ovn::controller(
include ovn::params
if $enable_dpdk and (is_service_default($datapath_type) or $datapath_type == undef){
if $enable_dpdk and (is_service_default($datapath_type) or !$datapath_type) {
fail('Datapath type must be set when DPDK is enabled')
}
@ -217,10 +217,14 @@ class ovn::controller(
$datapath_config = {
'external_ids:ovn-bridge-datapath-type' => { 'ensure' => 'absent' }
}
} else {
} elsif $datapath_type {
$datapath_config = {
'external_ids:ovn-bridge-datapath-type' => { 'value' => $datapath_type }
}
} else {
$datapath_config = {
'external_ids:ovn-bridge-datapath-type' => { 'ensure' => 'absent' }
}
}
$ovn_match_northd = {