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

Auto-merge for build 11 See merge request puppet/prometheus_cd!10
2025-10-18 09:08:10 +00:00
parent c80dd19c80 92c5dcffb1
commit abb80600de
2 changed files with 6 additions and 6 deletions
--- a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Ayumrepo.html
+++ b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Ayumrepo.html
@@ -124,10 +124,10 @@ class prometheus_cd::main::yumrepo (
    ensure   =&gt; &#39;present&#39;,
    name     =&gt; &#39;prometheus&#39;,
    descr    =&gt; &#39;prometheus rpms&#39;,
-    baseurl  =&gt; &#39;https://packagecloud.io/prometheus-rpm/release/el/9/$basearch&#39;,
-    gpgkey   =&gt; &#39;https://packagecloud.io/prometheus-rpm/release/gpgkey&#39;,
+    baseurl  =&gt; &#39;baseurl=https://packagecloud.io/prometheus-rpm/release/el/$releasever/$basearch&#39;,
+    gpgkey   =&gt; &#39;gpgkey=https://packagecloud.io/prometheus-rpm/release/gpgkey&#39;,
    enabled  =&gt; &#39;1&#39;,
-    gpgcheck =&gt; &#39;0&#39;,
+    gpgcheck =&gt; &#39;1&#39;,
    target   =&gt; &#39;/etc/yum.repo.d/prometheus.repo&#39;,
  }
 }</pre>
--- a/manifests/main/yumrepo.pp
+++ b/manifests/main/yumrepo.pp
@@ -9,10 +9,10 @@ class prometheus_cd::main::yumrepo (
    ensure   => 'present',
    name     => 'prometheus',
    descr    => 'prometheus rpms',
-    baseurl  => 'https://packagecloud.io/prometheus-rpm/release/el/9/$basearch',
-    gpgkey   => 'https://packagecloud.io/prometheus-rpm/release/gpgkey',
+    baseurl  => 'baseurl=https://packagecloud.io/prometheus-rpm/release/el/$releasever/$basearch',
+    gpgkey   => 'gpgkey=https://packagecloud.io/prometheus-rpm/release/gpgkey',
    enabled  => '1',
-    gpgcheck => '0',
+    gpgcheck => '1',
    target   => '/etc/yum.repo.d/prometheus.repo',
  }
 }