Backed out changeset 789ea5c30936

mozilla-releng · Apr 7, 2017 · 70bc2e1 · 70bc2e1
1 parent 50b155f
commit 70bc2e1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 43 deletions.
diff --git 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
@@ -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