confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 55

See merge request puppet/puppet_cd!51
This commit is contained in:
Jenkins
2025-10-25 17:20:14 +00:00
parent b3cf7e4c12 c49d441591
commit 819ce5a870
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
View File

@@ -163,7 +163,8 @@
65 65
66 66
67 67
68</pre> 68
69</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -225,7 +226,8 @@ class puppet_cd::r10k::install (
} }
exec { &#39;install rpm&#39;: exec { &#39;install rpm&#39;:
command =&gt; &quot;yum install ${pt_r10k_webhook_pkg}&quot;, command =&gt; &quot;yum install -y ${pt_r10k_webhook_pkg}&quot;,
unless =&gt; &quot;rpm -qa | grep ${pt_r10k_webhook_pkg}&quot;,
require =&gt; File[$pt_r10k_webhook_pkg], require =&gt; File[$pt_r10k_webhook_pkg],
} }
} }

3
manifests/r10k/install.pp
View File

@@ -60,7 +60,8 @@ class puppet_cd::r10k::install (
} }
exec { 'install rpm': exec { 'install rpm':
command => "yum install ${pt_r10k_webhook_pkg}", command => "yum install -y ${pt_r10k_webhook_pkg}",
unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
require => File[$pt_r10k_webhook_pkg], require => File[$pt_r10k_webhook_pkg],
} }
} }