Changes to vmguest.pp to support EL7

VMWare does not package vmware-tools-esx-nox for EL7. They
instead recommend the use of open-vm-tools. Added a condition
and refactored the manifest appropriately.

manifests/vmguest.pp

@@ -33,29 +33,37 @@ class base::vmguest {
       }
     }
     'RedHat': {
-      base::rpm::yumrepo { "vmware-tools-EL${::lsbmajdistrelease}.repo": }
-      base::rpm::import {
-        'vmware-tools-dsa':
-          url       =>
-            'http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub',
-            signature => 'gpg-pubkey-04bbaa7b-4c881cbf';
-        'vmware-tools-rsa':
-          url       =>
-            'http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub',
-            signature => 'gpg-pubkey-66fd4949-4803fe57';
-      }
-      package {
-        'VMwareTools':
-          ensure  => absent;
-        'vmware-tools-esx-nox':
-          ensure  => present,
-          require => [
+      # we do not the rebundled version by this name
+      package { 'VMwareTools': ensure => absent }
+      # VMWare recommends open-vm-tools for EL7
+      if ($::lsbmajdistrelease != '7') {
+        base::rpm::yumrepo { "vmware-tools-EL${::lsbmajdistrelease}.repo": }
+        base::rpm::import {
+          'vmware-tools-dsa':
+            url       =>
+              'http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub',
+              signature => 'gpg-pubkey-04bbaa7b-4c881cbf';
+          'vmware-tools-rsa':
+            url       =>
+              'http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub',
+              signature => 'gpg-pubkey-66fd4949-4803fe57';
+        }
+        package { 'vmware-tools-esx-nox':
+            ensure  => present,
+            require => [
               Base::Rpm::Yumrepo["vmware-tools-EL${::lsbmajdistrelease}.repo"],
               Base::Rpm::Import['vmware-tools-dsa'],
               Base::Rpm::Import['vmware-tools-rsa'],
               Package['VMwareTools']
-            ];
+              ],
+        }
+      } else { # EL7-only, since VMWare does not package vmware-tools* for it
+        package { 'open-vm-tools':
+          ensure  => installed,
+          require => Package['VMwareTools'],
+        }
       }
+      # for all EL releases
       service { 'smartd':
         ensure => stopped,
         enable => false,