summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-07-16 15:07:00 -0400
committerMicah Anderson <micah@riseup.net>2012-07-16 15:07:00 -0400
commitf1a6bc15299fd07022805eb941112495bc64c5e4 (patch)
tree872be626c41796acf0ebdee4b40455de5621338e /manifests
parent47808ed4f4a446ed48b448d72e820ca60e05776c (diff)
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
Diffstat (limited to 'manifests')
-rw-r--r--manifests/puppetmaster/package.pp14
1 files changed, 11 insertions, 3 deletions
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 }
}
}