Merge pull request puppetlabs#1432 from DavidS/modules-3140-use-hasrestart

bmjen · bmjen · commit f6a82f497f48 · 2016-04-19T10:21:00.000-07:00
(MODULES-3140) explicitly rely on hasrestart if no restart command is…
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -38,12 +38,16 @@
       $_service_ensure = undef
     }
   }
+
+  $service_hasrestart = $service_restart == undef
+
   if $service_manage {
     service { 'httpd':
-      ensure  => $_service_ensure,
-      name    => $service_name,
-      enable  => $service_enable,
-      restart => $service_restart
+      ensure     => $_service_ensure,
+      name       => $service_name,
+      enable     => $service_enable,
+      restart    => $service_restart,
+      hasrestart => $service_hasrestart,
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,16 @@`
`38`	`38`	`$_service_ensure = undef`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ $service_hasrestart = $service_restart == undef`
	`43`	`+`
`41`	`44`	`if $service_manage {`
`42`	`45`	`service { 'httpd':`
`43`		`- ensure => $_service_ensure,`
`44`		`- name => $service_name,`
`45`		`- enable => $service_enable,`
`46`		`- restart => $service_restart`
	`46`	`+ ensure => $_service_ensure,`
	`47`	`+ name => $service_name,`
	`48`	`+ enable => $service_enable,`
	`49`	`+ restart => $service_restart,`
	`50`	`+ hasrestart => $service_hasrestart,`
`47`	`51`	`}`
`48`	`52`	`}`
`49`	`53`	`}`