From 898a1f9c8fdf7843cad890ec3ee7fd655654e8d6 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 22 Mar 2011 12:20:35 -0400
Subject: add debian-specific puppetmaster require parameter package override

---
 manifests/debian.pp                      | 4 ++++
 manifests/puppetmaster/package.pp        | 1 +
 manifests/puppetmaster/package/debian.pp | 6 ++++++
 3 files changed, 11 insertions(+)
 create mode 100644 manifests/puppetmaster/package/debian.pp

diff --git a/manifests/debian.pp b/manifests/debian.pp
index 690c7c5..90e8327 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -26,6 +26,10 @@ class puppet::debian inherits puppet::linux {
   package{ 'puppet-common':
     ensure => $puppet_ensure_version,
   }
+
+  Package['puppet']{
+    require => Package['puppet-common'];
+  }       
 }
 
 
diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp
index 4be146d..145792e 100644
--- a/manifests/puppetmaster/package.pp
+++ b/manifests/puppetmaster/package.pp
@@ -3,6 +3,7 @@
 class puppet::puppetmaster::package inherits puppet::puppetmaster::linux {
   case $operatingsystem {
     centos: { include puppet::puppetmaster::package::centos }
+    debian: { include puppet::puppetmaster::package::debian }
     default: { include puppet::puppetmaster::package::base }
   }
 }
diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp
new file mode 100644
index 0000000..254d55f
--- /dev/null
+++ b/manifests/puppetmaster/package/debian.pp
@@ -0,0 +1,6 @@
+class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package {
+
+  Package['puppetmaster']{
+    require => Package['puppetmaster-common'];
+  }
+}
-- 
cgit v1.2.3