replace legacy-facts with modern ones

thias · Aug 31, 2023 · 7b52e2a · 7b52e2a
1 parent 69b48d9
commit 7b52e2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -28,8 +28,8 @@
   if $chroot == true {
     $packagenamesuffix = '-chroot'
     # Different service name with chroot on RHEL7+)
-    if $::osfamily == 'RedHat' and
-        versioncmp($::operatingsystemrelease, '7') >= 0 {
+    if $facts['os']['family'] == 'RedHat' and
+        versioncmp($facts['os']['release']['major'], '7') >= 0 {
       $servicenamesuffix = '-chroot'
     } else {
       $servicenamesuffix = ''

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -2,15 +2,15 @@
 #
 class bind::params {
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       $packagenameprefix = 'bind'
       $servicename       = 'named'
       $binduser          = 'root'
       $bindgroup         = 'named'
       $file_hint         = 'named.ca'
       $file_rfc1912      = '/etc/named.rfc1912.zones'
-      if versioncmp($::operatingsystemrelease, '8') >= 0 {
+      if versioncmp($facts['os']['release']['major'], '8') >= 0 {
         $file_bindkeys   = '/etc/named.root.key'
       } else {
         $file_bindkeys   = '/etc/named.iscdlv.key'