From f1a6bc15299fd07022805eb941112495bc64c5e4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 16 Jul 2012 15:07:00 -0400 Subject: remove unnecessary inheritance of puppet::puppetmaster::package to puppet::puppetmaster::linux provide a warning message if you have tried to specify $puppetmaster_ensure_version on an operatingsystem that is not supported --- manifests/puppetmaster/package.pp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'manifests') diff --git a/manifests/puppetmaster/package.pp b/manifests/puppetmaster/package.pp index 145792e..aef3121 100644 --- a/manifests/puppetmaster/package.pp +++ b/manifests/puppetmaster/package.pp @@ -1,9 +1,17 @@ # manifests/puppetmaster/package.pp -class puppet::puppetmaster::package inherits puppet::puppetmaster::linux { +class puppet::puppetmaster::package { case $operatingsystem { - centos: { include puppet::puppetmaster::package::centos } + centos: { + if $puppetmaster_ensure_version { + warn('$puppetmaster_ensure_version is not supported for this operatingsystem') + } + include puppet::puppetmaster::package::centos } debian: { include puppet::puppetmaster::package::debian } - default: { include puppet::puppetmaster::package::base } + default: { + if $puppetmaster_ensure_version { + warn('$puppetmaster_ensure_version is not supported for this operatingsystem') + } + include puppet::puppetmaster::package::base } } } -- cgit v1.2.3