Merge pull request puppetlabs#608 from david22swan/param_fix

(maint) - facts fix for centos
nikzeyn · May 12, 2020 · 7792ff5 · 7792ff5
2 parents 915bf8a + dd45182
commit 7792ff5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -483,7 +483,7 @@
     }
   }
 
-  if ($facts['os']['name'] == 'CentOS') and (versioncmp($facts['os']['release']['full'], '7') < 0) {
+  if ($facts['os']['name'] == 'CentOS') and (versioncmp($facts['os']['release']['major'], '7') < 0) {
     fail(translate('This module only works on CentOS version 7 and higher based systems.'))
   }
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -199,13 +199,13 @@
       $service_after_override      = undef
       $use_upstream_package_source = true
 
-      $package_ce_source_location  = "https://download.docker.com/linux/centos/${facts['os']['release']['full']}/${facts['os']['architecture']}/${docker_ce_channel}"
+      $package_ce_source_location  = "https://download.docker.com/linux/centos/${facts['os']['release']['major']}/${facts['os']['architecture']}/${docker_ce_channel}"
       $package_ce_key_source       = 'https://download.docker.com/linux/centos/gpg'
       $package_ce_key_id           = undef
       $package_ce_release          = undef
       $package_key_id              = undef
       $package_release             = undef
-      $package_source_location     = "https://yum.dockerproject.org/repo/main/centos/${facts['os']['release']['full']}"
+      $package_source_location     = "https://yum.dockerproject.org/repo/main/centos/${facts['os']['release']['major']}"
       $package_key_source          = 'https://yum.dockerproject.org/gpg'
       $package_key_check_source    = true
       $package_ee_source_location  = $docker_ee_source_location
-Original file line number
+Diff line change
@@ Expand Up / @@ -483,7 +483,7 @@ @@
         }
       }
-      if ($facts['os']['name'] == 'CentOS') and (versioncmp($facts['os']['release']['full'], '7') < 0) {
+      if ($facts['os']['name'] == 'CentOS') and (versioncmp($facts['os']['release']['major'], '7') < 0) {
         fail(translate('This module only works on CentOS version 7 and higher based systems.'))
       }
@@ Expand Down @@