diff options
| author | Micah Anderson <micah@riseup.net> | 2011-04-22 16:45:50 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-04-22 16:45:50 -0400 |
| commit | 517a06aa3f2edf36114a8e3b5202ed21be4cc4e7 (patch) | |
| tree | c108f70b1bb89258a3c10f863ab1f85e95ee22fa /manifests/puppetmaster/package | |
| parent | 651e870e70abd5c71616f5676d1e785bddd5ee81 (diff) | |
fix problem where you are not on wheezy or sid, but you install a newer version through puppetmaster_ensure_version (such as through backports)
Diffstat (limited to 'manifests/puppetmaster/package')
| -rw-r--r-- | manifests/puppetmaster/package/debian.pp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp index 4c4f68b..27b64b1 100644 --- a/manifests/puppetmaster/package/debian.pp +++ b/manifests/puppetmaster/package/debian.pp @@ -1,13 +1,21 @@ class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package::base { - if !$puppetmaster_ensure_version { $puppetmaster_ensure_version = 'installed' } - case $lsbdistcodename { + 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 + } + } + } } - + Package["puppetmaster"]{ require => $puppetmaster_common_required ? { '' => undef, |