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

Auto-merge for build 7

See merge request puppet/puppet_cd!5

doc/_index.html

@@ -123,6 +123,11 @@
       
             </li>
     
+            <li>
+      <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span>
       

doc/puppet_class_list.html

@@ -113,14 +113,21 @@
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::r10k::webhook" class="even">
+    <li id="object_puppet_classes::puppet_cd::r10k::install" class="even">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::puppet_cd::r10k::webhook" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::puppet_cd::server::service" class="odd">
+    <li id="object_puppet_classes::puppet_cd::server::service" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span>
       </div>

doc/puppet_classes/puppet_cd_3A_3Aparams.html

@@ -77,6 +77,8 @@
       
       <span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/>
       
+      <span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span><br/>
+      
       <span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span><br/>
       
       <span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/>
@@ -252,7 +254,7 @@
         <span class='type'>(<tt>Array</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;]</tt>)</em>
+        <em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#39;]</tt>)</em>
       
       
         &mdash;
@@ -1662,7 +1664,7 @@ class puppet_cd::params (
   String $pt_agent_pkg              = &#39;puppet-agent&#39;,
   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;],
+  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;],
 
   # user settings
   ## puppet user

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html

@@ -131,7 +131,15 @@
 33
 34
 35
-36</pre>
+36
+37
+38
+39
+40
+41
+42
+43
+44</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -141,10 +149,18 @@ class puppet_cd::r10k::install (
 ) inherits puppet_cd::params {
 #  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
   if $pt_use_r10k == true {
+    # enable CRB
+    exec { &#39;enable_crb&#39;:
+      command =&gt; &#39;dnf config-manager --set-enabled crb&#39;,
+      unless  =&gt; &#39;dnf repolist --disabled | grep -qE &quot;crb|CodeReady&quot;&#39;,
+      path    =&gt; [&#39;/usr/bin&#39;, &#39;/bin&#39;],
+    }
+
     # install required packages
     package { $pt_r10k_pkg:
-      ensure =&gt; $pt_pkg_ensure,
+      ensure  =&gt; $pt_pkg_ensure,
-      before =&gt; Package[&#39;r10k&#39;],
+      before  =&gt; Package[&#39;r10k&#39;],
+      require =&gt; Exec[&#39;enable_crb&#39;],
     }
 
     # install r10k via gem

manifests/params.pp

@@ -94,7 +94,7 @@ class puppet_cd::params (
   String $pt_agent_pkg              = 'puppet-agent',
   String $pt_server_pkg             = 'puppetserver',
   Array $pt_db_pkg                  = ['puppetdb','puppetdb-termini'],
-  Array $pt_r10k_pkg                = ['ruby','ruby-devel'],
+  Array $pt_r10k_pkg                = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
 
   # user settings
   ## puppet user

manifests/r10k/install.pp

@@ -8,24 +8,24 @@ class puppet_cd::r10k::install (
 ) inherits puppet_cd::params {
 #  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
   if $pt_use_r10k == true {
-    # install required packages
+    # enable CRB
-    package { $pt_r10k_pkg:
-      ensure => $pt_pkg_ensure,
-      before => Exec['enable_crb'],
-    }
-
-    # enable CRB and install development_tools
     exec { 'enable_crb':
       command => 'dnf config-manager --set-enabled crb',
       unless  => 'dnf repolist --disabled | grep -qE "crb|CodeReady"',
-      path    => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'],
+      path    => ['/usr/bin', '/bin'],
+    }
+
+    # install required packages
+    package { $pt_r10k_pkg:
+      ensure  => $pt_pkg_ensure,
+      before  => Package['r10k'],
+      require => Exec['enable_crb'],
     }
 
     # install r10k via gem
     package { 'r10k':
       ensure   => $pt_pkg_ensure,
       provider => gem,
-      require Exec['enable_crb'],
     }
 
     # configure r10k.yaml