From 51c7b390694d95e7096e33317de4242d67ca7e38 Mon Sep 17 00:00:00 2001 From: Keith aka fugit Date: Wed, 13 Apr 2011 10:35:57 -0400 Subject: updated allow insatll of puppetmaster on squeeze. This addresses the package diferences. --- manifests/puppetmaster/package/debian.pp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'manifests/puppetmaster/package') diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp index 33d7d5e..4c4f68b 100644 --- a/manifests/puppetmaster/package/debian.pp +++ b/manifests/puppetmaster/package/debian.pp @@ -1,6 +1,25 @@ -class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package::base { - Package['puppetmaster']{ - require => Package['puppetmaster-common'] + if !$puppetmaster_ensure_version { $puppetmaster_ensure_version = 'installed' } + case $lsbdistcodename { + wheezy,sid: { + $puppetmaster_common_required = 'puppetmaster-common' + $puppetmaster_common_ensure = $puppetmaster_ensure_version + } + } + + Package["puppetmaster"]{ + require => $puppetmaster_common_required ? { + '' => undef, + default => Package["$puppetmaster_common_required"] + }, + ensure => $puppetmaster_ensure_version, + } + + package { "puppetmaster-common": + ensure => $puppetmaster_common_ensure ? { + '' => absent, + default => $puppetmaster_common_ensure + }, } } -- cgit v1.2.3