openstack
/
puppet-ovn
Code Issues Proposed changes

Remove logic to support $::os_service_default 

... because support for $::os_service_default was deprecated[1] during
the previous cycle.

[1] 5c809de016

Change-Id: Idb92e3d4f52eefabca992c027f1576700fc63234
This commit is contained in:
Takashi Kajinami 2022-11-28 14:20:37 +09:00
parent b5d38dcbd4
commit cb9fed3f7a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/controller.pp
View File

@ -130,7 +130,7 @@ class ovn::controller(
include ovn::params
if $enable_dpdk and (is_service_default($datapath_type) or !$datapath_type) {
if $enable_dpdk and ! $datapath_type {
fail('Datapath type must be set when DPDK is enabled')
}
@ -240,12 +240,7 @@ class ovn::controller(
}
}
if is_service_default($datapath_type) {
warning('Usage of $::os_service_default has been deprecated. Use undef instead')
$datapath_config = {
'external_ids:ovn-bridge-datapath-type' => { 'ensure' => 'absent' }
}
} elsif $datapath_type {
if $datapath_type {
$datapath_config = {
'external_ids:ovn-bridge-datapath-type' => { 'value' => $datapath_type }
}

5
releasenotes/notes/datapath_type-use-undef-force-db2267dda2e93ab1.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``ovn::controller::datapath_type`` parameter no longer supports
``$::os_service_default``. Use ``undef`` instead.