From 25c8e401004e15fbb15faa5dec7f6bb62aee0e8a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 16 Jul 2012 15:09:04 -0400
Subject: remove the complicated test case for determining if
 'puppetmaster-common' is needed or not, this is handled by the
 apt::preferences_snippet and debian's package dependency resolution now

stop inheriting puppet::master::package::base from puppet::puppetmaster::package::debian, it is no longer needed, because we are no longer overriding anything
---
 manifests/puppetmaster/package/debian.pp | 48 +++++++-------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp
index eca55e9..cea7ac4 100644
--- a/manifests/puppetmaster/package/debian.pp
+++ b/manifests/puppetmaster/package/debian.pp
@@ -1,41 +1,13 @@
-class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package::base {
+class puppet::puppetmaster::package::debian {
 
-  if !$puppetmaster_ensure_version {
-    $puppetmaster_ensure_version = 'installed'
-    case $lsbdistcodename {
-      wheezy,sid: {
-        $puppetmaster_common_required = 'puppetmaster-common'
-        $puppetmaster_common_ensure = $puppetmaster_ensure_version
-      }
-      default: {
-        if (versioncmp($puppetmaster_ensure_version, "2.6.7") >= 0) {
-          $puppetmaster_common_requred = 'puppetmaster-common'
-          $puppetmaster_common_ensure = $puppetmaster_ensure_version
-        }
-      }
-    }
-  }
-  else {
-    apt::preferences_snippet {
-      'puppet_passenger':
-        package => 'puppet*',
-        pin => "version $puppetmaster_ensure_version",
-        priority => 2000;
-    }
-  }
-  
-  Package["puppetmaster"]{
-        require => $puppetmaster_common_required ? {
-        '' => undef,
-        default => Package["$puppetmaster_common_required"]
-        },
-        ensure => $puppetmaster_ensure_version,
-  }
-
-  package { "puppetmaster-common": 
-        ensure => $puppetmaster_common_required ? {
-        '' => absent,
-        default => installed
-        },
+  include puppet::puppetmaster::package::base
+    
+  apt::preferences_snippet {
+    'puppet_passenger':
+      package => 'puppet*',
+      pin => "version $puppetmaster_ensure_version",
+      priority => 2000,
+      notify => Exec['refresh_apt'],
+      before => Package['puppetmaster'];
   }
 }
-- 
cgit v1.2.3