Merge branch 'jenkins-build-29' into 'master'

Auto-merge for build 29

See merge request puppet/puppet_cd!25

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html

@@ -161,7 +161,9 @@
 63
 64
 65
-66</pre>
+66
+67
+68</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/webhook.pp', line 6</span>
@@ -221,9 +223,11 @@ class puppet_cd::r10k::webhook (
 
     # manage service
     service { &#39;r10k-webhook&#39;:
-      ensure    =&gt; &#39;running&#39;,
-      enable    =&gt; true,
-      subscribe =&gt; File[$pt_r10k_hook_service_file],
+      ensure     =&gt; &#39;running&#39;,
+      hasstatus  =&gt; true,
+      hasrestart =&gt; true,
+      enable     =&gt; true,
+      subscribe  =&gt; File[$pt_r10k_hook_service_file],
     }
   }
 }</pre>

manifests/r10k/webhook.pp

@@ -58,9 +58,11 @@ class puppet_cd::r10k::webhook (
 
     # manage service
     service { 'r10k-webhook':
-      ensure    => 'running',
-      enable    => true,
-      subscribe => File[$pt_r10k_hook_service_file],
+      ensure     => 'running',
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+      subscribe  => File[$pt_r10k_hook_service_file],
     }
   }
 }