Install $majdistrelease pattern in params.pp.

Convert all $majdistrelease to $vmwaretools::params::majdistrelease to use the centralized fact discovery.
voxpupuli · Jul 23, 2013 · b35a888 · b35a888
1 parent 0e3bbc4
commit b35a888
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -272,12 +272,7 @@
         notify  => Service[$service_name_real],
       }
 
-      $majdistrelease = $::lsbmajdistrelease ? {
-        ''      => regsubst($::operatingsystemrelease,'^(\d+)\.(\d+)','\1'),
-        default => $::lsbmajdistrelease,
-      }
-
-      if ($::osfamily == 'RedHat') and ($majdistrelease == '6') and ($rhel_upstart == true) {
+      if ($::osfamily == 'RedHat') and ($vmwaretools::params::majdistrelease == '6') and ($rhel_upstart == true) {
         # VMware-tools 5.1 on EL6 is now using upstart and not System V init.
         # http://projects.puppetlabs.com/issues/11989#note-7
         service { $service_name_real :

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -147,6 +147,16 @@
     $safe_service_hasrestart = $service_hasrestart
   }
 
+  if $::operatingsystemmajrelease { # facter 1.7+
+    $majdistrelease = $::operatingsystemmajrelease
+  } elsif $::lsbmajdistrelease {    # requires LSB to already be installed
+    $majdistrelease = $::lsbmajdistrelease
+  } elsif $::os_maj_version {       # requires stahnma/epel
+    $majdistrelease = $::os_maj_version
+  } else {
+    $majdistrelease = regsubst($::operatingsystemrelease,'^(\d+)\.(\d+)','\1')
+  }
+
   case $::osfamily {
     'RedHat': {
       case $::operatingsystem {

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -115,21 +115,16 @@
         'RedHat', 'CentOS', 'Scientific', 'SLC', 'Ascendos', 'PSBM',
         'OracleLinux', 'OVS', 'OEL', 'SLES', 'SLED', 'OpenSuSE',
         'SuSE': {
-          $majdistrelease = $::lsbmajdistrelease ? {
-            ''      => regsubst($::operatingsystemrelease,'^(\d+)\.(\d+)','\1'),
-            default => $::lsbmajdistrelease,
-          }
-
           if ( $yum_path == $vmwaretools::params::yum_path ) or ( $just_prepend_yum_path == true ) {
             $gpgkey_url  = "${yum_server}${yum_path}/keys/"
-            $baseurl_url = "${yum_server}${yum_path}/esx/${tools_version}/${vmwaretools::params::baseurl_string}${majdistrelease}/${yum_basearch}/"
+            $baseurl_url = "${yum_server}${yum_path}/esx/${tools_version}/${vmwaretools::params::baseurl_string}${vmwaretools::params::majdistrelease}/${yum_basearch}/"
           } else {
             $gpgkey_url  = "${yum_server}${yum_path}/"
             $baseurl_url = "${yum_server}${yum_path}/"
           }
 
           yumrepo { 'vmware-tools':
-            descr          => "VMware Tools ${tools_version} - ${vmwaretools::params::baseurl_string}${majdistrelease} ${yum_basearch}",
+            descr          => "VMware Tools ${tools_version} - ${vmwaretools::params::baseurl_string}${vmwaretools::params::majdistrelease} ${yum_basearch}",
             enabled        => $yumrepo_enabled,
             gpgcheck       => '1',
             # gpgkey has to be a string value with an indented second line