From f7bb77c38d31021e810b1b55097fa3329bd73ce7 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 3 Oct 2013 15:27:33 -0400
Subject: fix name of base class file

Change-Id: I844970f1c8f895d5a460d5082bfa1a2a88b32ecd
---
 .../modules/site_config/manifests/packages/base.pp | 28 ++++++++++++++++++++++
 .../manifests/packages/base_packages.pp            | 28 ----------------------
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 puppet/modules/site_config/manifests/packages/base.pp
 delete mode 100644 puppet/modules/site_config/manifests/packages/base_packages.pp

(limited to 'puppet/modules/site_config/manifests/packages')

diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
new file mode 100644
index 00000000..d93e194b
--- /dev/null
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -0,0 +1,28 @@
+class site_config::packages::base {
+
+  # base set of packages that we want to have installed everywhere
+  package { [ 'etckeeper', 'screen', 'less' ]:
+    ensure => installed,
+  }
+
+  # base set of packages that we want to remove everywhere
+  package { [ 'acpi', 'acpid', 'acpi-support-base',  'eject', 'ftp',
+              'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
+              'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
+              'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
+              'tk8.5', 'os-prober', 'unzip', 'xauth', 'x11-common',
+              'x11-utils', 'xterm' ]:
+    ensure => absent;
+  }
+
+  if $::virtual == 'virtualbox' {
+    $virtualbox_ensure = present
+  } else {
+    $virtualbox_ensure = absent
+  }
+
+  package { [ 'build-essential', 'fontconfig-config', 'g++', 'g++-4.7', 'gcc',
+              'gcc-4.6', 'gcc-4.7', 'cpp', 'cpp-4.6', 'cpp-4.7', 'libc6-dev' ]:
+                ensure => $virtualbox_ensure
+  }
+}
diff --git a/puppet/modules/site_config/manifests/packages/base_packages.pp b/puppet/modules/site_config/manifests/packages/base_packages.pp
deleted file mode 100644
index d93e194b..00000000
--- a/puppet/modules/site_config/manifests/packages/base_packages.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class site_config::packages::base {
-
-  # base set of packages that we want to have installed everywhere
-  package { [ 'etckeeper', 'screen', 'less' ]:
-    ensure => installed,
-  }
-
-  # base set of packages that we want to remove everywhere
-  package { [ 'acpi', 'acpid', 'acpi-support-base',  'eject', 'ftp',
-              'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
-              'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
-              'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
-              'tk8.5', 'os-prober', 'unzip', 'xauth', 'x11-common',
-              'x11-utils', 'xterm' ]:
-    ensure => absent;
-  }
-
-  if $::virtual == 'virtualbox' {
-    $virtualbox_ensure = present
-  } else {
-    $virtualbox_ensure = absent
-  }
-
-  package { [ 'build-essential', 'fontconfig-config', 'g++', 'g++-4.7', 'gcc',
-              'gcc-4.6', 'gcc-4.7', 'cpp', 'cpp-4.6', 'cpp-4.7', 'libc6-dev' ]:
-                ensure => $virtualbox_ensure
-  }
-}
-- 
cgit v1.2.3