Make parameter names more sensible
This updates the parameters introduced by [1] during this cycle, to
better represent for what the parameter is used.
[1] 02512cccbc
Change-Id: If3630e6a08abc8216fbd5e059fb5a8e51294b6da
This commit is contained in:
parent
bdffc5bb6b
commit
49652f75dc
|
@ -1,9 +1,9 @@
|
|||
---
|
||||
ovn::controller::package_name: 'ovn-host'
|
||||
ovn::controller::service_name: 'ovn-host'
|
||||
ovn::controller::config_file_path: '/etc/default/ovn-host'
|
||||
ovn::controller::config_option_name: 'OVN_CTL_OPTS'
|
||||
ovn::controller::environment_file_path: '/etc/default/ovn-host'
|
||||
ovn::controller::opts_envvar_name: 'OVN_CTL_OPTS'
|
||||
ovn::northd::package_name: 'ovn-central'
|
||||
ovn::northd::service_name: 'ovn-central'
|
||||
ovn::northd::config_file_path: '/etc/default/ovn-central'
|
||||
ovn::northd::config_option_name: 'OVN_CTL_OPTS'
|
||||
ovn::northd::environment_file_path: '/etc/default/ovn-central'
|
||||
ovn::northd::opts_envvar_name: 'OVN_CTL_OPTS'
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
---
|
||||
ovn::controller::package_name: 'openvswitch-ovn-host'
|
||||
ovn::controller::service_name: 'ovn-controller'
|
||||
ovn::controller::config_file_path: '/etc/sysconfig/ovn-controller'
|
||||
ovn::controller::config_option_name: 'OVN_CONTROLLER_OPTS'
|
||||
ovn::controller::environment_file_path: '/etc/sysconfig/ovn-controller'
|
||||
ovn::controller::opts_envvar_name: 'OVN_CONTROLLER_OPTS'
|
||||
ovn::northd::package_name: 'openvswitch-ovn-central'
|
||||
ovn::northd::service_name: 'ovn-northd'
|
||||
ovn::northd::config_file_path: '/etc/sysconfig/ovn-northd'
|
||||
ovn::northd::config_option_name: 'OVN_NORTHD_OPTS'
|
||||
ovn::northd::environment_file_path: '/etc/sysconfig/ovn-northd'
|
||||
ovn::northd::opts_envvar_name: 'OVN_NORTHD_OPTS'
|
||||
|
|
|
@ -11,10 +11,10 @@
|
|||
# [*service_name*]
|
||||
# (required) Name of ovn-controller service.
|
||||
#
|
||||
# [*config_file_path*]
|
||||
# (required) File path of the ovn-controller config file
|
||||
# [*environment_file_path*]
|
||||
# (required) File path of the ovn-controller environment file
|
||||
#
|
||||
# [*config_option_name*]
|
||||
# [*opts_envvar_name*]
|
||||
# (required) Name of the environment variable to customize options to launch
|
||||
# the ovn-controller service.
|
||||
#
|
||||
|
@ -142,8 +142,8 @@
|
|||
class ovn::controller(
|
||||
String[1] $service_name,
|
||||
String[1] $package_name,
|
||||
Stdlib::Absolutepath $config_file_path,
|
||||
String[1] $config_option_name,
|
||||
Stdlib::Absolutepath $environment_file_path,
|
||||
String[1] $opts_envvar_name,
|
||||
String $ovn_remote,
|
||||
String $ovn_encap_ip,
|
||||
String $package_ensure = 'present',
|
||||
|
@ -213,8 +213,8 @@ class ovn::controller(
|
|||
$ovn_controller_opts = join($ovn_controller_ssl_opts + $ovn_controller_extra_opts, ' ')
|
||||
|
||||
augeas { 'config-ovn-controller':
|
||||
context => "/files${config_file_path}",
|
||||
changes => "set ${config_option_name} '\"${ovn_controller_opts}\"'",
|
||||
context => "/files${environment_file_path}",
|
||||
changes => "set ${opts_envvar_name} '\"${ovn_controller_opts}\"'",
|
||||
require => Package['ovn-controller'],
|
||||
notify => Service['controller'],
|
||||
}
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
# [*service_name*]
|
||||
# (required) Name of ovn-northd service.
|
||||
#
|
||||
# [*config_file_path*]
|
||||
# (required) File path of the ovn-controller config file
|
||||
# [*environment_file_path*]
|
||||
# (required) File path of the ovn-controller environment file
|
||||
#
|
||||
# [*config_option_name*]
|
||||
# [*opts_envvar_name*]
|
||||
# (required) Name of the environment variable to customize options to launch
|
||||
# the ovn-controller service.
|
||||
#
|
||||
|
@ -83,8 +83,8 @@
|
|||
class ovn::northd(
|
||||
String[1] $package_name,
|
||||
String[1] $service_name,
|
||||
Stdlib::Absolutepath $config_file_path,
|
||||
String[1] $config_option_name,
|
||||
Stdlib::Absolutepath $environment_file_path,
|
||||
String[1] $opts_envvar_name,
|
||||
String $package_ensure = 'present',
|
||||
String $dbs_listen_ip = '0.0.0.0',
|
||||
Optional[String] $dbs_cluster_local_addr = undef,
|
||||
|
@ -228,8 +228,8 @@ class ovn::northd(
|
|||
' ')
|
||||
|
||||
augeas { 'config-ovn-northd':
|
||||
context => "/files${config_file_path}",
|
||||
changes => "set ${config_option_name} '\"${ovn_northd_opts}\"'",
|
||||
context => "/files${environment_file_path}",
|
||||
changes => "set ${opts_envvar_name} '\"${ovn_northd_opts}\"'",
|
||||
require => Package['ovn-northd'],
|
||||
before => Service['northd'],
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue