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

Auto-merge for build 52

See merge request puppet/puppet_cd!48

doc/puppet_classes/puppet_cd_3A_3Aparams.html

@@ -1476,7 +1476,7 @@
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;https://3for.me/jp029&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;/tmp/webhook-go.rpm&#39;</tt>)</em>
       
       
         &mdash;
@@ -1689,7 +1689,7 @@ class puppet_cd::params (
   String $pt_server_pkg             = &#39;puppetserver&#39;,
   Array $pt_db_pkg                  = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;],
   Array $pt_r10k_pkg                = [&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#39;],
-  String $pt_r10k_webhook_pkg       = &#39;https://3for.me/jp029&#39;, # points to rpm
+  String $pt_r10k_webhook_pkg       = &#39;/tmp/webhook-go.rpm&#39;,
 
   # user settings
   ## puppet user

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html

@@ -157,7 +157,13 @@
 59
 60
 61
-62</pre>
+62
+63
+64
+65
+66
+67
+68</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -213,8 +219,14 @@ class puppet_cd::r10k::install (
       content  =&gt; template($pt_r10k_erb),
     }
     if $pt_use_r10k_webhook == true {
+      file { $pt_r10k_webhook_pkg:
+        ensure =&gt; file,
+        source =&gt; &#39;puppet:///modules/puppet_cd/webhook-go.rpm&#39;
+      }
+
       package { $pt_r10k_webhook_pkg:
         ensure  =&gt; $pt_pkg_ensure,
+        require =&gt; File[$pt_r10k_webhook_pkg]
       }
     }
   }

manifests/params.pp

@@ -97,7 +97,7 @@ class puppet_cd::params (
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
   Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
-  String $pt_r10k_webhook_pkg       = 'https://3for.me/jp029', # points to rpm
+  String $pt_r10k_webhook_pkg       = '/tmp/webhook-go.rpm',
 
   # user settings
   ## puppet user

manifests/r10k/install.pp

@@ -54,8 +54,14 @@ class puppet_cd::r10k::install (
       content  => template($pt_r10k_erb),
     }
     if $pt_use_r10k_webhook == true {
+      file { $pt_r10k_webhook_pkg:
+        ensure => file,
+        source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
+      }
+
       package { $pt_r10k_webhook_pkg:
         ensure  => $pt_pkg_ensure,
+        require => File[$pt_r10k_webhook_pkg]
       }
     }
   }