From 7d49ebaa89f167384ba2b2da0a34e94b515a9233 Mon Sep 17 00:00:00 2001
From: Adam Lewenberg <adamhl@stanford.edu>
Date: Tue, 28 May 2013 15:35:51 -0700
Subject: [PATCH] vmguest: switch to use VMWare's tools packages
---
files/rpm/vmware-tools-EL4.repo | 7 +++++++
files/rpm/vmware-tools-EL5.repo | 7 +++++++
files/rpm/vmware-tools-EL6.repo | 7 +++++++
manifests/vmguest.pp | 24 +++++++++++++++++++++++-
4 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 files/rpm/vmware-tools-EL4.repo
create mode 100644 files/rpm/vmware-tools-EL5.repo
create mode 100644 files/rpm/vmware-tools-EL6.repo
diff --git a/files/rpm/vmware-tools-EL4.repo b/files/rpm/vmware-tools-EL4.repo
new file mode 100644
index 0000000..1b30ab4
--- /dev/null
+++ b/files/rpm/vmware-tools-EL4.repo
@@ -0,0 +1,7 @@
+[vmware-tools]
+name=VMware Tools
+baseurl=http://yum.stanford.edu/mrepo/vmware-tools-latest-$basearch/RPMS.rhel4
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+enabled=1
+gpgcheck=1
diff --git a/files/rpm/vmware-tools-EL5.repo b/files/rpm/vmware-tools-EL5.repo
new file mode 100644
index 0000000..b0eeb6c
--- /dev/null
+++ b/files/rpm/vmware-tools-EL5.repo
@@ -0,0 +1,7 @@
+[vmware-tools]
+name=VMware Tools
+baseurl=http://yum.stanford.edu/mrepo/vmware-tools-latest-$basearch/RPMS.rhel5
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+enabled=1
+gpgcheck=1
diff --git a/files/rpm/vmware-tools-EL6.repo b/files/rpm/vmware-tools-EL6.repo
new file mode 100644
index 0000000..cef197a
--- /dev/null
+++ b/files/rpm/vmware-tools-EL6.repo
@@ -0,0 +1,7 @@
+[vmware-tools]
+name=VMware Tools
+baseurl=http://yum.stanford.edu/mrepo/vmware-tools-latest-$basearch/RPMS.rhel6
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-DSA-KEY.pub
+gpgkey=http://yum.stanford.edu/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+enabled=1
+gpgcheck=1
diff --git a/manifests/vmguest.pp b/manifests/vmguest.pp
index a1fcf1f..b80874c 100644
--- a/manifests/vmguest.pp
+++ b/manifests/vmguest.pp
@@ -29,7 +29,29 @@ class base::vmguest {
}
}
'redhat': {
- package { 'VMwareTools': ensure => present }
+ 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 => [
+ Base::Rpm::Yumrepo["vmware-tools-EL${::lsbmajdistrelease}.repo"],
+ Base::Rpm::Import['vmware-tools-dsa'],
+ Base::Rpm::Import['vmware-tools-rsa'],
+ Package['VMwareTools']
+ ];
+ }
service { 'smartd':
ensure => stopped,
enable => false,
--
GitLab