openstack
/
puppet-ovn
Code Issues Proposed changes

Stop converting integer/boolean in vs_config 

Now the vs_config resource type accepts integer or boolean and we don't
need to convert these types to strings.

Depends-on: https://review.opendev.org/823244
Change-Id: Id1d2d6eda7747ae7a751214860eed560a5a32499
This commit is contained in:
Takashi Kajinami 2022-07-15 17:39:43 +09:00
parent 1d90282fd2
commit 9620b38cf0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/controller.pp
View File

@ -161,9 +161,9 @@ class ovn::controller(
'external_ids:hostname' => { 'value' => $hostname },
'external_ids:ovn-bridge' => { 'value' => $ovn_bridge },
'external_ids:ovn-cms-options' => { 'value' => $ovn_cms_options_real },
'external_ids:ovn-remote-probe-interval' => { 'value' => "${ovn_remote_probe_interval}" },
'external_ids:ovn-openflow-probe-interval' => { 'value' => "${ovn_openflow_probe_interval}" },
'external_ids:ovn-monitor-all' => { 'value' => "${ovn_monitor_all}" },
'external_ids:ovn-remote-probe-interval' => { 'value' => $ovn_remote_probe_interval },
'external_ids:ovn-openflow-probe-interval' => { 'value' => $ovn_openflow_probe_interval },
'external_ids:ovn-monitor-all' => { 'value' => $ovn_monitor_all },
}
if !empty($ovn_chassis_mac_map) {
@ -223,7 +223,7 @@ class ovn::controller(
}
$ovn_match_northd = {
'external_ids:ovn-match-northd-version' => { 'value' => bool2str($enable_ovn_match_northd) }
'external_ids:ovn-match-northd-version' => { 'value' => $enable_ovn_match_northd }
}
create_resources('vs_config', merge($config_items, $chassis_mac_map, $bridge_items, $tz_items, $datapath_config, $ovn_match_northd))
Service['openvswitch'] -> Vs_config<||> -> Service['controller']