opendev
/
puppet-kerberos
Code Issues Proposed changes

Simplify service management 

This simplification takes advantage of the fact that ensure => running
is equivalent to ensure => true (and similar for stopped and false) to
reduce the number of variables we have to track to ensure a service is
both enabled and running or disabled and stopped.

This also fixes krb5-kpropd to run on boot without waiting for a puppet
pulse.

Change-Id: I7255cd6bd719946b7525bcbbff983038d81b48a6
This commit is contained in:
Clark Boylan 2019-02-22 14:18:47 -08:00
parent 672583bd10
commit 4ef7a6d3bc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/server.pp
View File

@ -52,14 +52,12 @@ class kerberos::server (
} }
if ($slave) { if ($slave) {
$run_admin_server = stopped $run_kadmind = false # Synonym for stopped
$run_kadmind = false $run_kpropd = true
$run_kpropd = running
$kprop_cron = absent $kprop_cron = absent
} else { } else {
$run_admin_server = running $run_kadmind = true # Synonym for running
$run_kadmind = true $run_kpropd = false
$run_kpropd = stopped
$kprop_cron = present $kprop_cron = present
} }
@ -89,6 +87,7 @@ class kerberos::server (
} }
service { 'krb5-kpropd': service { 'krb5-kpropd':
ensure => $run_kpropd, ensure => $run_kpropd,
enable => $run_kpropd,
require => [ require => [
File['/etc/systemd/system/krb5-kpropd.service'], File['/etc/systemd/system/krb5-kpropd.service'],
], ],
@ -120,6 +119,7 @@ class kerberos::server (
service { 'krb5-kpropd': service { 'krb5-kpropd':
ensure => $run_kpropd, ensure => $run_kpropd,
enable => $run_kpropd,
require => [ require => [
File['/etc/init.d/krb5-kpropd'], File['/etc/init.d/krb5-kpropd'],
], ],
@ -127,7 +127,7 @@ class kerberos::server (
} }
service { 'krb5-admin-server': service { 'krb5-admin-server':
ensure => $run_admin_server, ensure => $run_kadmind,
enable => $run_kadmind, enable => $run_kadmind,
subscribe => File['/etc/krb5kdc/kadm5.acl'], subscribe => File['/etc/krb5kdc/kadm5.acl'],
require => [ require => [