daemon-reload only for puppet version < 6.1.0

Author: sheenaajay

manifests/server/config.pp

@@ -224,19 +224,19 @@
       # - $datadir
       # - @extra_systemd_config
 
+  if (versioncmp($facts['puppetversion'], '6.1.0') < 0) {
     exec { 'restart-systemd':
       command     => 'systemctl daemon-reload',
       refreshonly => true,
       path        => '/bin:/usr/bin:/usr/local/bin',
+      require     => File['old-systemd-override'],
       before      => Class['postgresql::server::service'],
     }
-
-    if (versioncmp($facts['puppetversion'], '6.1.0') < 0) {
-      $systemd_notify = [Exec['restart-systemd'], Class['postgresql::server::service']]
-    }
-    else {
-      $systemd_notify = Class['postgresql::server::service']
-    }
+    $systemd_notify = [Exec['restart-systemd']
+  }
+  else {
+    $systemd_notify = Class['postgresql::server::service']
+  }
 
     file {
       default:
@@ -264,7 +264,7 @@
     file {'old-systemd-override':
       ensure => absent,
       path   => "/etc/systemd/system/${service_name}.service",
-      before => Exec['restart-systemd'],
+      before => $systemd_notify,
     }
   }
 }