(WIP) add common/osfamily/%{os.family}/major/%{os.release.major}.yaml

hiera.yaml

@@ -13,7 +13,9 @@ hierarchy:
       - "cluster/%{cluster}.yaml"
       - "site/%{site}/role/%{role}.yaml"
       - "site/%{site}.yaml"
+      - "role/%{role}/osfamily/%{os.family}/major/%{os.release.major}.yaml"
       - "role/%{role}.yaml"
+      - "common/osfamily/%{os.family}/major/%{os.release.major}.yaml"
       - "common.yaml"
   - name: "public hiera"
     datadir: "/etc/puppetlabs/code/environments/%{environment}/hieradata"

hieradata/common.yaml

@@ -207,10 +207,6 @@ puppet_agent::package_version: "6.27.1"
 puppet_agent::collection: "puppet6"
 puppet_agent::config:
   - {section: "agent", setting: "environment", ensure: "absent"}
-profile::core::yum::versionlock:
-  0:puppet-agent-6.27.1-1.el7.x86_64:
-    ensure: "present"
-    before: "Package[puppet-agent]"
 
 # Rsyslog configuration is based on the default rsyslog.conf shipping with CentOS 7.7
 rsyslog::config::global_config:
@@ -418,18 +414,3 @@ ccs_hcu::pkgurl: "%{lookup('profile::ccs::common::pkgurl')}"
 ccs_monit::pkgurl: "%{lookup('profile::ccs::common::pkgurl')}"
 
 profile::core::docker::version: "20.10.12"
-profile::core::docker::versionlock:
-  0:containerd.io-1.4.12-3.1.el7.x86_64:
-    # puppetlabs/docker only specifies a package resource for containerd.io for uninstall
-    ensure: "present"
-  0:docker-ce-rootless-extras-20.10.12-3.el7.x86_64:
-    ensure: "present"
-  0:docker-scan-plugin-0.12.0-3.el7.x86_64:
-    ensure: "present"
-  1:docker-ce-cli-20.10.12-3.el7.x86_64:
-    ensure: "present"
-    before: "Package[docker-ce-cli]"
-  3:docker-ce-20.10.12-3.el7.x86_64:
-    ensure: "present"
-    # the puppet package resource name is `docker` with a seperate name param of `docker-ce`
-    before: "Package[docker]"

hieradata/common/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,21 @@
+---
+profile::core::yum::versionlock:
+  0:puppet-agent-6.27.1-1.el7.x86_64:
+    ensure: "present"
+    before: "Package[puppet-agent]"
+
+profile::core::docker::versionlock:
+  0:containerd.io-1.4.12-3.1.el7.x86_64:
+    # puppetlabs/docker only specifies a package resource for containerd.io for uninstall
+    ensure: "present"
+  0:docker-ce-rootless-extras-20.10.12-3.el7.x86_64:
+    ensure: "present"
+  0:docker-scan-plugin-0.12.0-3.el7.x86_64:
+    ensure: "present"
+  1:docker-ce-cli-20.10.12-3.el7.x86_64:
+    ensure: "present"
+    before: "Package[docker-ce-cli]"
+  3:docker-ce-20.10.12-3.el7.x86_64:
+    ensure: "present"
+    # the puppet package resource name is `docker` with a seperate name param of `docker-ce`
+    before: "Package[docker]"

hieradata/common/osfamily/RedHat/major/8.yaml

@@ -0,0 +1,25 @@
+---
+profile::core::yum::versionlock:
+  puppet-agent:
+    ensure: "present"
+    version: "6.27.1"
+    epoch: 1
+    before: "Package[puppet-agent]"
+
+profile::core::docker::versionlock:
+  containerd.io-1.4.12-3.1.el7.x86_64:
+    # puppetlabs/docker only specifies a package resource for containerd.io for uninstall
+    ensure: "present"
+  docker-ce-rootless-extras-20.10.12-3.el7.x86_64:
+    ensure: "present"
+  docker-scan-plugin-0.12.0-3.el7.x86_64:
+    ensure: "present"
+  docker-ce-cli-20.10.12-3.el7.x86_64:
+    ensure: "present"
+    epoch: 1
+    before: "Package[docker-ce-cli]"
+  docker-ce-20.10.12-3.el7.x86_64:
+    ensure: "present"
+    epoch: 3
+    # the puppet package resource name is `docker` with a seperate name param of `docker-ce`
+    before: "Package[docker]"