Merge pull request #454 from francis826/redhat_operatingsystemmajrelease

Fix to detect the major release version for redhat/centos 7
voxpupuli · Sep 21, 2014 · f4ef310 · f4ef310
2 parents d11d574 + 230857f
commit f4ef310
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -19,6 +19,13 @@
   $package_name   = 'nginx',
 ) {
 
+  if $::lsbmajdistrelease {
+    $major_dist_release = $::lsbmajdistrelease
+  }
+  else {
+    $major_dist_release = $::operatingsystemmajrelease
+  }
+
   case $::operatingsystem {
     'fedora': {
       # nginx.org does not supply RPMs for fedora
@@ -31,9 +38,9 @@
       }
     }
     default: {
-      case $::lsbmajdistrelease {
+      case $major_dist_release {
         5, 6, 7: {
-          $os_rel = $::lsbmajdistrelease
+          $os_rel = $major_dist_release
         }
         default: {
           # Amazon uses the year as the $::lsbmajdistrelease