From 4ef7a6d3bc79ef5ddc33de36adadd502debc1aca Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 22 Feb 2019 14:18:47 -0800
Subject: [PATCH] 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
---
 manifests/server.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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