Debian/Ubuntu: Drop old workaround for broken service status
It seems the issue no longer exists in Debian or Ubuntu, likely since these distributions replaced init by systemd. Change-Id: I432917dd991409c434ce5c7fac9fd6458943d266
This commit is contained in:
@@ -171,8 +171,6 @@ class ovn::controller(
|
|||||||
service { 'controller':
|
service { 'controller':
|
||||||
ensure => true,
|
ensure => true,
|
||||||
name => $::ovn::params::ovn_controller_service_name,
|
name => $::ovn::params::ovn_controller_service_name,
|
||||||
hasstatus => $::ovn::params::ovn_controller_service_status,
|
|
||||||
pattern => $::ovn::params::ovn_controller_service_pattern,
|
|
||||||
enable => true,
|
enable => true,
|
||||||
subscribe => Vs_config['external_ids:ovn-remote']
|
subscribe => Vs_config['external_ids:ovn-remote']
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -222,8 +222,6 @@ class ovn::northd(
|
|||||||
ensure => true,
|
ensure => true,
|
||||||
enable => true,
|
enable => true,
|
||||||
name => $::ovn::params::ovn_northd_service_name,
|
name => $::ovn::params::ovn_northd_service_name,
|
||||||
hasstatus => $::ovn::params::ovn_northd_service_status,
|
|
||||||
pattern => $::ovn::params::ovn_northd_service_pattern,
|
|
||||||
require => Service['openvswitch']
|
require => Service['openvswitch']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,9 @@ class ovn::params {
|
|||||||
$ovn_northd_package_name = 'openvswitch-ovn-central'
|
$ovn_northd_package_name = 'openvswitch-ovn-central'
|
||||||
$ovn_controller_package_name = 'openvswitch-ovn-host'
|
$ovn_controller_package_name = 'openvswitch-ovn-host'
|
||||||
$ovn_northd_service_name = 'ovn-northd'
|
$ovn_northd_service_name = 'ovn-northd'
|
||||||
$ovn_northd_service_status = true
|
|
||||||
$ovn_northd_service_pattern = undef
|
|
||||||
$ovn_northd_context = '/files/etc/sysconfig/ovn-northd'
|
$ovn_northd_context = '/files/etc/sysconfig/ovn-northd'
|
||||||
$ovn_northd_option_name = 'OVN_NORTHD_OPTS'
|
$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_pattern = undef
|
|
||||||
$ovn_controller_context = '/files/etc/sysconfig/ovn-controller'
|
$ovn_controller_context = '/files/etc/sysconfig/ovn-controller'
|
||||||
$ovn_controller_option_name = 'OVN_CONTROLLER_OPTS'
|
$ovn_controller_option_name = 'OVN_CONTROLLER_OPTS'
|
||||||
}
|
}
|
||||||
@@ -24,13 +20,9 @@ class ovn::params {
|
|||||||
$ovn_northd_package_name = 'ovn-central'
|
$ovn_northd_package_name = 'ovn-central'
|
||||||
$ovn_controller_package_name = 'ovn-host'
|
$ovn_controller_package_name = 'ovn-host'
|
||||||
$ovn_northd_service_name = 'ovn-central'
|
$ovn_northd_service_name = 'ovn-central'
|
||||||
$ovn_northd_service_status = false # status broken in UCA
|
|
||||||
$ovn_northd_service_pattern = 'ovn-northd'
|
|
||||||
$ovn_northd_context = '/files/etc/default/ovn-central'
|
$ovn_northd_context = '/files/etc/default/ovn-central'
|
||||||
$ovn_northd_option_name = 'OVN_CTL_OPTS'
|
$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_pattern = 'ovn-controller'
|
|
||||||
$ovn_controller_context = '/files/etc/default/ovn-host'
|
$ovn_controller_context = '/files/etc/default/ovn-host'
|
||||||
$ovn_controller_option_name = 'OVN_CTL_OPTS'
|
$ovn_controller_option_name = 'OVN_CTL_OPTS'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ describe 'ovn::controller' do
|
|||||||
:ensure => true,
|
:ensure => true,
|
||||||
:name => platform_params[:ovn_controller_service_name],
|
:name => platform_params[:ovn_controller_service_name],
|
||||||
:enable => true,
|
:enable => true,
|
||||||
:hasstatus => platform_params[:ovn_controller_service_status],
|
|
||||||
:pattern => platform_params[:ovn_controller_service_pattern],
|
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -271,8 +269,6 @@ describe 'ovn::controller' do
|
|||||||
{
|
{
|
||||||
:ovn_controller_package_name => 'ovn-host',
|
:ovn_controller_package_name => 'ovn-host',
|
||||||
:ovn_controller_service_name => 'ovn-host',
|
:ovn_controller_service_name => 'ovn-host',
|
||||||
:ovn_controller_service_status => false,
|
|
||||||
:ovn_controller_service_pattern => 'ovn-controller',
|
|
||||||
:ovn_controller_context => '/files/etc/default/ovn-host',
|
:ovn_controller_context => '/files/etc/default/ovn-host',
|
||||||
:ovn_controller_option_name => 'OVN_CTL_OPTS'
|
:ovn_controller_option_name => 'OVN_CTL_OPTS'
|
||||||
}
|
}
|
||||||
@@ -283,8 +279,6 @@ describe 'ovn::controller' do
|
|||||||
{
|
{
|
||||||
:ovn_controller_package_name => 'openvswitch-ovn-host',
|
:ovn_controller_package_name => 'openvswitch-ovn-host',
|
||||||
:ovn_controller_service_name => 'ovn-controller',
|
:ovn_controller_service_name => 'ovn-controller',
|
||||||
:ovn_controller_service_status => true,
|
|
||||||
:ovn_controller_service_pattern => nil,
|
|
||||||
:ovn_controller_context => '/files/etc/sysconfig/ovn-controller',
|
:ovn_controller_context => '/files/etc/sysconfig/ovn-controller',
|
||||||
:ovn_controller_option_name => 'OVN_CONTROLLER_OPTS'
|
:ovn_controller_option_name => 'OVN_CONTROLLER_OPTS'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -233,8 +233,6 @@ describe 'ovn::northd' do
|
|||||||
:ensure => true,
|
:ensure => true,
|
||||||
:name => platform_params[:ovn_northd_service_name],
|
:name => platform_params[:ovn_northd_service_name],
|
||||||
:enable => true,
|
:enable => true,
|
||||||
:hasstatus => platform_params[:ovn_northd_service_status],
|
|
||||||
:pattern => platform_params[:ovn_northd_service_pattern],
|
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -261,8 +259,6 @@ describe 'ovn::northd' do
|
|||||||
{
|
{
|
||||||
:ovn_northd_package_name => 'ovn-central',
|
:ovn_northd_package_name => 'ovn-central',
|
||||||
:ovn_northd_service_name => 'ovn-central',
|
:ovn_northd_service_name => 'ovn-central',
|
||||||
:ovn_northd_service_status => false,
|
|
||||||
:ovn_northd_service_pattern => 'ovn-northd',
|
|
||||||
:ovn_northd_context => '/files/etc/default/ovn-central',
|
:ovn_northd_context => '/files/etc/default/ovn-central',
|
||||||
:ovn_northd_option_name => 'OVN_CTL_OPTS'
|
:ovn_northd_option_name => 'OVN_CTL_OPTS'
|
||||||
}
|
}
|
||||||
@@ -274,8 +270,6 @@ describe 'ovn::northd' do
|
|||||||
{
|
{
|
||||||
:ovn_northd_package_name => 'openvswitch-ovn-central',
|
:ovn_northd_package_name => 'openvswitch-ovn-central',
|
||||||
:ovn_northd_service_name => 'ovn-northd',
|
:ovn_northd_service_name => 'ovn-northd',
|
||||||
:ovn_northd_service_status => true,
|
|
||||||
:ovn_northd_service_pattern => nil,
|
|
||||||
:ovn_northd_context => '/files/etc/sysconfig/ovn-northd',
|
:ovn_northd_context => '/files/etc/sysconfig/ovn-northd',
|
||||||
:ovn_northd_option_name => 'OVN_NORTHD_OPTS'
|
:ovn_northd_option_name => 'OVN_NORTHD_OPTS'
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user