From 62271e0e067daef064dba2860a92eb6351510d3c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 26 Sep 2013 15:47:03 -0400
Subject: create a site_config::packages directory, move
 site_config::base_packages to site_config::packages::base add
 site_config::packages::gnutls for inclusion (#3955)

Change-Id: I9599eb26844503613c16f57ee17d6ea7bd0cf6fb
---
 .../modules/site_config/manifests/base_packages.pp | 28 ----------------------
 puppet/modules/site_config/manifests/default.pp    |  2 +-
 .../manifests/packages/base_packages.pp            | 28 ++++++++++++++++++++++
 .../site_config/manifests/packages/gnutls.pp       |  5 ++++
 4 files changed, 34 insertions(+), 29 deletions(-)
 delete mode 100644 puppet/modules/site_config/manifests/base_packages.pp
 create mode 100644 puppet/modules/site_config/manifests/packages/base_packages.pp
 create mode 100644 puppet/modules/site_config/manifests/packages/gnutls.pp

(limited to 'puppet')

diff --git a/puppet/modules/site_config/manifests/base_packages.pp b/puppet/modules/site_config/manifests/base_packages.pp
deleted file mode 100644
index 3d40f7a2..00000000
--- a/puppet/modules/site_config/manifests/base_packages.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class site_config::base_packages {
-
-  # 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/default.pp b/puppet/modules/site_config/manifests/default.pp
index 16932ab2..d3bb241f 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -48,7 +48,7 @@ class site_config::default {
   }
 
   # install/remove base packages
-  include site_config::base_packages
+  include site_config::packages::base
 
   # include basic shorewall config
   include site_shorewall::defaults
diff --git a/puppet/modules/site_config/manifests/packages/base_packages.pp b/puppet/modules/site_config/manifests/packages/base_packages.pp
new file mode 100644
index 00000000..d93e194b
--- /dev/null
+++ b/puppet/modules/site_config/manifests/packages/base_packages.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/gnutls.pp b/puppet/modules/site_config/manifests/packages/gnutls.pp
new file mode 100644
index 00000000..b1f17480
--- /dev/null
+++ b/puppet/modules/site_config/manifests/packages/gnutls.pp
@@ -0,0 +1,5 @@
+class site_config::packages::gnutls {
+
+  package { 'gnutls-bin': ensure => installed }
+
+}
-- 
cgit v1.2.3