confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 54

See merge request puppet/puppet_cd!50
This commit is contained in:
Jenkins
2025-10-25 17:14:05 +00:00
parent 1da3e4bff0 d9f8ee0f7d
commit b3cf7e4c12
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/_index.html
View File

@@ -123,6 +123,11 @@
</li> </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> <li>
<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> <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>

9
doc/puppet_class_list.html
View File

@@ -113,7 +113,14 @@
</li> </li>
<li id="object_puppet_classes::puppet_cd::server::service" 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::server::service" class="odd">
<div class="item"> <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> <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> </div>

2
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -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_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_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</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/>
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span><br/>

6
doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
View File

@@ -224,9 +224,9 @@ class puppet_cd::r10k::install (
source =&gt; &#39;puppet:///modules/puppet_cd/webhook-go.rpm&#39; source =&gt; &#39;puppet:///modules/puppet_cd/webhook-go.rpm&#39;
} }
package { $pt_r10k_webhook_pkg: exec { &#39;install rpm&#39;:
ensure =&gt; $pt_pkg_ensure, command =&gt; &quot;yum install ${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,8 +60,7 @@ class puppet_cd::r10k::install (
} }
exec { 'install rpm': exec { 'install rpm':
command = "yum install ${pt_r10k_webhook_pkg}", command => "yum install ${pt_r10k_webhook_pkg}",
ensure => $pt_pkg_ensure,
require => File[$pt_r10k_webhook_pkg], require => File[$pt_r10k_webhook_pkg],
} }
} }