openstack/puppet-ovn
Code Issues Proposed changes

Merge "Gather all os specific parameters into ovn::parms"

Browse Source
This commit is contained in:
Zuul 2020-05-04 17:04:57 +00:00 committed by Gerrit Code Review
commit 5e9334b826
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/northd.pp
View File

@ -23,20 +23,6 @@ class ovn::northd(
include ovn::params include ovn::params
include vswitch::ovs include vswitch::ovs
case $::osfamily {
'RedHat': {
$ovn_northd_context = '/files/etc/sysconfig/ovn-northd'
$ovn_northd_option_name = 'OVN_NORTHD_OPTS'
}
'Debian': {
$ovn_northd_context = '/files/etc/default/ovn-central'
$ovn_northd_option_name = 'OVN_CTL_OPTS'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
}
}
$ovn_northd_opts_addr = "--db-nb-addr=${dbs_listen_ip} --db-sb-addr=${dbs_listen_ip} \ $ovn_northd_opts_addr = "--db-nb-addr=${dbs_listen_ip} --db-sb-addr=${dbs_listen_ip} \
--db-nb-create-insecure-remote=yes --db-sb-create-insecure-remote=yes" --db-nb-create-insecure-remote=yes --db-sb-create-insecure-remote=yes"
@ -56,8 +42,8 @@ class ovn::northd(
' ') ' ')
augeas { 'config-ovn-northd': augeas { 'config-ovn-northd':
context => $ovn_northd_context, context => $::ovn::params::ovn_northd_context,
changes => "set ${ovn_northd_option_name} '\"${ovn_northd_opts}\"'", changes => "set ${$::ovn::params::ovn_northd_option_name} '\"${ovn_northd_opts}\"'",
before => Service['northd'], before => Service['northd'],
} }

4
manifests/params.pp
View File

@ -12,6 +12,8 @@ class ovn::params {
$ovn_northd_service_name = 'ovn-northd' $ovn_northd_service_name = 'ovn-northd'
$ovn_northd_service_status = true $ovn_northd_service_status = true
$ovn_northd_service_pattern = undef $ovn_northd_service_pattern = undef
$ovn_northd_context = '/files/etc/sysconfig/ovn-northd'
$ovn_northd_option_name = 'OVN_NORTHD_OPTS'
$ovn_controller_service_name = 'ovn-controller' $ovn_controller_service_name = 'ovn-controller'
$ovn_controller_service_status = true $ovn_controller_service_status = true
$ovn_controller_service_pattern = undef $ovn_controller_service_pattern = undef
@ -22,6 +24,8 @@ class ovn::params {
$ovn_northd_service_name = 'ovn-central' $ovn_northd_service_name = 'ovn-central'
$ovn_northd_service_status = false # status broken in UCA $ovn_northd_service_status = false # status broken in UCA
$ovn_northd_service_pattern = 'ovn-northd' $ovn_northd_service_pattern = 'ovn-northd'
$ovn_northd_context = '/files/etc/default/ovn-central'
$ovn_northd_option_name = 'OVN_CTL_OPTS'
$ovn_controller_service_name = 'ovn-host' $ovn_controller_service_name = 'ovn-host'
$ovn_controller_service_status = false # status broken in UCA $ovn_controller_service_status = false # status broken in UCA
$ovn_controller_service_pattern = 'ovn-controller' $ovn_controller_service_pattern = 'ovn-controller'