confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 9

See merge request puppet/puppet_cd!7
This commit is contained in:
Jenkins
2025-10-21 20:22:55 +00:00
parent 21c30135cf 7ff0fca4a0
commit 5e5961ff8a
3 changed files with 4 additions and 7 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

@@ -152,8 +152,7 @@
54 54
55 55
56 56
57 57</pre>
58</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>
@@ -161,8 +160,7 @@
class puppet_cd::r10k::install ( class puppet_cd::r10k::install (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
# if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
if $pt_use_r10k == true {
# enable CRB # enable CRB
exec { &#39;enable_crb&#39;: exec { &#39;enable_crb&#39;:
command =&gt; &#39;dnf config-manager --set-enabled crb&#39;, command =&gt; &#39;dnf config-manager --set-enabled crb&#39;,

3
manifests/r10k/install.pp
View File

@@ -6,8 +6,7 @@
class puppet_cd::r10k::install ( class puppet_cd::r10k::install (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
# if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
if $pt_use_r10k == true {
# enable CRB # enable CRB
exec { 'enable_crb': exec { 'enable_crb':
command => 'dnf config-manager --set-enabled crb', command => 'dnf config-manager --set-enabled crb',

2
templates/r10k/r10k.yaml.erb
View File

@@ -3,5 +3,5 @@
:sources: :sources:
:puppet: :puppet:
remote: <%= @pt_r10k_remote %> remote: <%= @pt_r10k_remote %>
prefix: <&= @pt_r10k_prefix %> prefix: <%= @pt_r10k_prefix %>
basedir: '<%= @pt_r10k_basedir %>' basedir: '<%= @pt_r10k_basedir %>'