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

Auto-merge for build 8

See merge request puppet/puppet_cd!6

doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html

@@ -139,7 +139,21 @@
 41
 42
 43
-44</pre>
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -169,6 +183,19 @@ class puppet_cd::r10k::install (
       provider =&gt; gem,
     }
 
+    # create r10k dir
+    file { &#39;r10k_dir&#39;:
+      ensure   =&gt; directory,
+      path     =&gt; $pt_r10k_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; puppet_etc_t,
+      seluser  =&gt; unconfined_u,
+    }
+
     # configure r10k.yaml
     file { $pt_r10k_file:
       ensure   =&gt; file,
@@ -179,6 +206,7 @@ class puppet_cd::r10k::install (
       selrole  =&gt; object_r,
       seltype  =&gt; puppet_etc_t,
       seluser  =&gt; unconfined_u,
+      require  =&gt; File[&#39;r10k_dir&#39;],
       content  =&gt; template($pt_r10k_erb),
     }
   }

manifests/r10k/install.pp

@@ -28,6 +28,19 @@ class puppet_cd::r10k::install (
       provider => gem,
     }
 
+    # create r10k dir
+    file { 'r10k_dir':
+      ensure   => directory,
+      path     => $pt_r10k_dir,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => unconfined_u,
+    }
+
     # configure r10k.yaml
     file { $pt_r10k_file:
       ensure   => file,
@@ -38,6 +51,7 @@ class puppet_cd::r10k::install (
       selrole  => object_r,
       seltype  => puppet_etc_t,
       seluser  => unconfined_u,
+      require  => File['r10k_dir'],
       content  => template($pt_r10k_erb),
     }
   }