feat: deep merge yum repos to manage

- fixed merging of yum repos - changed puppet7 to use local copy of repo
2024-03-28 21:13:23 +11:00
parent 6b92910457
commit e02921be75
9 changed files with 13 additions and 22 deletions
@@ -18,7 +18,7 @@ lookup_options:
  profiles::pki::vault::ip_sans:
    merge:
      strategy: deep
-  profiles::yum::managed_repos:
+  profiles::yum::global::managed_repos:
    merge:
      strategy: deep

@@ -1,6 +1,6 @@
 # hieradata/os/AlmaLinux/AlmaLinux8.yaml
 ---
-profiles::yum::managed_repos:
+profiles::yum::global::managed_repos:
  - 'base'
  - 'appstream'
  - 'epel'
@@ -1,6 +1,6 @@
 # hieradata/os/AlmaLinux/AlmaLinux9.yaml
 ---
-profiles::yum::managed_repos:
+profiles::yum::global::managed_repos:
  - 'base'
  - 'appstream'
  - 'epel'
@@ -1,5 +1,5 @@
 ---
-profiles::yum::managed_repos:
+profiles::yum::global::managed_repos:
  - 'virt-advanced-virtualization'
  - 'storage-ceph-pacific'
  - 'cloud-openstack-xena'
@@ -1,7 +1,7 @@
 ---
 profiles::firewall::firewalld::ensure_package: 'installed'
 profiles::firewall::firewalld::ensure_service: 'running'
-profiles::yum::managed_repos:
+profiles::yum::global::managed_repos:
  - 'virt-advanced-virtualization'
  - 'storage-ceph-pacific'
  - 'cloud-openstack-xena'
@@ -119,7 +119,7 @@ profiles::reposync::repos_list:
    osname: 'puppet7'
    release: 'el'
    baseurl: 'https://yum.puppet.com/puppet7/el/8/x86_64/'
-    gpgkey: 'https://yum.puppet.com/RPM-GPG-KEY-puppet'
+    gpgkey: 'https://yum.puppet.com/RPM-GPG-KEY-puppet-20250406'
  postgresql_rhel8_common:
    repository: 'common'
    description: 'PostgreSQL Common RHEL 8'