From 86b83d3bb245d212a14afa8a4ae9bf31db50761d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 16 Apr 2024 13:35:04 +0200 Subject: [PATCH] Gentoo/Debian: Enable hasstatus for service The services are deployed as proper systemd services on all OSes. When hasstatus is true, Puppet will use systemctl to check if the service is running. If it's false, Puppet will try to grep within `ps` for the service. That's unreliable and doesn't make any sense. See: https://www.puppet.com/docs/puppet/8/types/service.html#service-description it's not clear why this ever was introduced: https://github.com/voxpupuli/puppet-keepalived/commit/ace4ed6aa1f269e249b84ce19a615e18b68c3cd3 --- REFERENCE.md | 2 ++ data/os/Debian.yaml | 1 - data/os/Gentoo.yaml | 1 - data/os/RedHat.yaml | 1 - manifests/init.pp | 2 +- spec/classes/keepalived_spec.rb | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 260dfdd1c4..2b58205984 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -187,6 +187,8 @@ Data type: `Boolean` +Default value: `true` + ##### `service_manage` Data type: `Boolean` diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml index 3109233ec5..90964d9513 100644 --- a/data/os/Debian.yaml +++ b/data/os/Debian.yaml @@ -1,5 +1,4 @@ --- keepalived::sysconf_dir: 'default' keepalived::sysconf_options: '' -keepalived::service_hasstatus: false keepalived::service_hasrestart: false diff --git a/data/os/Gentoo.yaml b/data/os/Gentoo.yaml index ac2d0c32a4..554ae40263 100644 --- a/data/os/Gentoo.yaml +++ b/data/os/Gentoo.yaml @@ -1,5 +1,4 @@ --- keepalived::sysconf_dir: 'conf.d' keepalived::sysconf_options: '-D' -keepalived::service_hasstatus: false keepalived::service_hasrestart: false diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml index 72f49e7b2f..284364600c 100644 --- a/data/os/RedHat.yaml +++ b/data/os/RedHat.yaml @@ -1,5 +1,4 @@ --- keepalived::sysconf_dir: 'sysconfig' keepalived::sysconf_options: '-D' -keepalived::service_hasstatus: true keepalived::service_hasrestart: true diff --git a/manifests/init.pp b/manifests/init.pp index ea54cb730a..6cdc1e4181 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -57,7 +57,7 @@ String[1] $sysconf_dir, String $sysconf_options, Boolean $service_hasrestart, - Boolean $service_hasstatus, + Boolean $service_hasstatus = true, Stdlib::Absolutepath $config_dir = '/etc/keepalived', Stdlib::Filemode $config_dir_mode = '0755', diff --git a/spec/classes/keepalived_spec.rb b/spec/classes/keepalived_spec.rb index b204e77bab..56f2ec08b1 100644 --- a/spec/classes/keepalived_spec.rb +++ b/spec/classes/keepalived_spec.rb @@ -36,7 +36,7 @@ 'ensure' => 'running', 'enable' => 'true', 'hasrestart' => 'false', - 'hasstatus' => 'false' + 'hasstatus' => 'true' ) } else