refactor legacy facts to add compatibility with puppet 8

redhataccess · Jan 31, 2023 · 16de95c · 16de95c
1 parent c51f7a1
commit 16de95c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/manifests/current.pp b/manifests/current.pp
@@ -68,7 +68,7 @@
     require => Package[$package_name],
   }
 
-  if versioncmp($::operatingsystemrelease, '7.0') >= 0 {
+  if versioncmp($facts['os']['release']['full'], '7.0') >= 0 {
     file { [
         "/etc/cron.weekly/${package_name}",
         "/etc/cron.daily/${package_name}",

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -54,8 +54,8 @@
   if $deployment_style {
     $class_name = $deployment_style
   } else {
-    if (versioncmp($::operatingsystemrelease, '6.10') < 0 or
-      (versioncmp($::operatingsystemrelease, '7.0') >= 0 and versioncmp($::operatingsystemrelease, '7.5') < 0)) {
+    if (versioncmp($facts['os']['release']['full'], '6.10') < 0 or
+    (versioncmp($facts['os']['release']['full'], '7.0') >= 0 and versioncmp($facts['os']['release']['full'], '7.5') < 0)) {
       $class_name = 'old'
     } else {
       $class_name = 'current'

diff --git a/spec/classes/current_spec.rb b/spec/classes/current_spec.rb
@@ -3,7 +3,7 @@
 describe 'access_insights_client::current' do
   context 'on 6.10' do
     let :facts do
-      {:operatingsystemrelease => '6.10'}
+      {os: {release: {full: '6.10'}}}
     end
 
     it { is_expected.to compile.with_all_deps }
@@ -21,7 +21,7 @@
 
   context 'on 7.0' do
     let :facts do
-      {:operatingsystemrelease => '7.0'}
+      {os: {release: {full: '7.0'}}}
     end
 
     it { is_expected.to compile.with_all_deps }

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -8,7 +8,7 @@
       end
 
       let :facts do
-        {:operatingsystemrelease => '6.10'}
+        {os: {release: {full: '6.10'}}}
       end
 
       it { is_expected.to compile.with_all_deps }
@@ -26,7 +26,7 @@
     }.each do |version, expected|
       context "on #{version}" do
         let :facts do
-          {:operatingsystemrelease => version}
+        {os: {release: {full: version}}}
         end
 
         it { is_expected.to compile.with_all_deps }