From 70bc2e11c162806759ae68bc673cd61f6c35ccf0 Mon Sep 17 00:00:00 2001
From: Jake Watkins <jwatkins@mozilla.com>
Date: Fri, 7 Apr 2017 08:41:07 -0700
Subject: [PATCH] Backed out changeset 789ea5c30936

---
 manifests/moco-nodes.pp                 |  4 ++--
 modules/hardware/manifests/init.pp      | 17 -----------------
 modules/packages/manifests/xen_tools.pp | 24 ------------------------
 3 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 modules/packages/manifests/xen_tools.pp

diff --git a/manifests/moco-nodes.pp b/manifests/moco-nodes.pp
index 49397353f2..364eff6808 100644
--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -1045,7 +1045,7 @@
     $aspects = [ 'low-security' ]
     $slave_trustlevel = 'try'
     $pin_puppet_server = "releng-puppet2.srv.releng.scl3.mozilla.com"
-    $pin_puppet_env = "dcrisan"
-    include toplevel::slave::releng::test::gpu
+    $pin_puppet_env = "jwatkins"
+    include toplevel::base
 }
 
diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
index 04ca9d38f7..a24d57293a 100644
--- a/modules/hardware/manifests/init.pp
+++ b/modules/hardware/manifests/init.pp
@@ -87,23 +87,6 @@
             }
         }
     }
-    if ($::virtual == "xenhvm") {
-        case $::operatingsystem {
-            Ubuntu: {
-                case $::operatingsystemrelease {
-                    16.04: {
-                        class {'packages::xen_tools': }
-                    }
-                    default: {
-                        fail("Unrecognized Ubuntu version $::operatingsystemrelease")
-                    }
-                }
-            }
-            default: {
-                fail ("Operating system $::operatingsystem not suported")
-            }
-        }
-    }
     if ($::operatingsystem == "Windows") {
         include hardware::hddoff
         include hardware::highperformance
diff --git a/modules/packages/manifests/xen_tools.pp b/modules/packages/manifests/xen_tools.pp
deleted file mode 100644
index f5634addfb..0000000000
--- a/modules/packages/manifests/xen_tools.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-class packages::xen_tools {
-
-    case $::operatingsystem {
-        Ubuntu: {
-            case $::operatingsystemrelease {
-                16.04: {
-                    package {
-                        'xen-tools':
-                            ensure => '4.6.2-1'
-                    }
-                }
-                default: {
-                    fail("Ubuntu $operatingsystemrelease is not supported")
-                }
-            }
-        }
-        default: {
-            fail('Cannot install open-vm-tools on this platform')
-        }
-    }
-}