feat: move additional redhat repos into hiera

Moves the logic for CentOS and Rocky additional supporting repos out of
the repo class itself and into hiera where they can be more precisely
maintained.

Note that this code nolonger handles the CRB or PowerTools repos for
RedHat derivatives other than Rocky and CentOS.

Author: pdemonaco

data/os/RedHat_CentOS.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  crb:
+    descr: 'CentOS Linux $releasever - CRB'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
+    mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=CRB&infra=$infra'

data/os/RedHat_CentOS_8.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  powertools:
+    descr: 'CentOS Linux $releasever - PowerTools'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
+    mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra'

data/os/RedHat_Rocky.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  crb:
+    descr: 'Rocky Linux $releasever - CRB'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
+    mirrorlist: 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever'

data/os/RedHat_Rocky_8.yaml

@@ -0,0 +1,8 @@
+---
+powerdns::supporting_repos:
+  powertools:
+    descr: 'Rocky Linux $releasever - PowerTools'
+    enabled: true
+    gpgcheck: true
+    gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
+    mirrorlist: 'https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever'

hiera.yaml

@@ -6,16 +6,21 @@ defaults:  # Used for any hierarchy level that omits these keys.
   data_hash: yaml_data  # Use the built-in YAML backend.
 
 hierarchy:
-  - name: "osfamily/major release"
+  - name: "family & name & major release"
     paths:
         # Used to distinguish between Debian and Ubuntu
-      - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
-      - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}_%{facts.os.name}_%{facts.os.release.major}.yaml"
+  - name: "family & major release"
+    paths:
+        # Used to distinguish between Debian and Ubuntu
+      - "os/%{facts.os.family}_%{facts.os.release.major}.yaml"
         # Used for Solaris
-      - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
-  - name: "osfamily"
+      - "os/%{facts.os.family}_%{facts.kernelrelease}.yaml"
+  - name: "family & name"
+    paths:
+      - "os/%{facts.os.family}_%{facts.os.name}.yaml"
+  - name: "family"
     paths:
-      - "os/%{facts.os.name}.yaml"
       - "os/%{facts.os.family}.yaml"
   - name: 'common'
     path: 'common.yaml'

manifests/init.pp

@@ -12,6 +12,9 @@
 #   Records database will be split into this number of shards
 # @param lmdb_sync_mode
 #   Sync mode for LMDB. One of 'nosync', 'sync', 'nometasync', 'mapasync'
+# @param supporting_repos
+#   Additional repos that include dependencies for pdns on this OS. Currently
+#   only used by RedHat derivatives
 #
 class powerdns (
   String[1] $authoritative_package_name,
@@ -65,6 +68,7 @@
   Hash $forward_zones = {},
   Powerdns::Autoprimaries $autoprimaries = {},
   Boolean $purge_autoprimaries = false,
+  Hash[String,Hash] $supporting_repos = {}
 ) {
   # Do some additional checks. In certain cases, some parameters are no longer optional.
   if $authoritative {

manifests/repo.pp

@@ -1,5 +1,5 @@
 # powerdns::repo
-class powerdns::repo inherits powerdns {
+class powerdns::repo {
   # The repositories of PowerDNS use a version such as '40' for version 4.0
   # and 41 for version 4.1.
   $authoritative_short_version = regsubst($powerdns::authoritative_version, /^(\d+)\.(\d+)(?:\.\d+)?$/, '\\1\\2', 'G')
@@ -14,29 +14,11 @@
       Yumrepo['powerdns'] -> Package <| title == $powerdns::authoritative_package_name |>
       Yumrepo['powerdns-recursor'] -> Package <| title == $powerdns::recursor_package_name |>
 
-      $repo_desc = $facts['os']['release']['major'] ? {
-        '8'     => 'PowerTools',
-        default => 'CRB',
-      }
-      $repo_name = $repo_desc.downcase()
-      if ($facts['os']['name'] == 'Rocky') {
-        $code_repo_params = {
-          mirrorlist => "https://mirrors.rockylinux.org/mirrorlist?arch=\$basearch&repo=${repo_desc}-\$releasever",
-          gpgkey     => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial',
-        }
-      } else {
-        $code_repo_params = {
-          mirrorlist => "http://mirrorlist.centos.org/?release=\$releasever&arch=\$basearch&repo=${repo_desc}&infra=\$infra",
-          gpgkey     => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial',
+      $powerdns::supporting_repos.each |$repo_name, $repo_data| {
+        yumrepo { $repo_name:
+          * => $repo_data,
         }
       }
-      yumrepo { $repo_name:
-        ensure   => 'present',
-        descr    => "${$facts['os']['name']} Linux \$releasever - ${repo_desc}",
-        enabled  => 'true',
-        gpgcheck => 'true',
-        *        => $code_repo_params,
-      }
 
       yumrepo { 'powerdns':
         name        => 'powerdns',

metadata.json

@@ -33,8 +33,7 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "8",
-        "9"
+        "8"
       ]
     },
     {