summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-16 22:45:38 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-16 22:45:38 -0200
commit30c9e2678d538a3db58f0ff3066cccced0b9cc33 (patch)
tree66ac86f50334f557e5b64a652e830edafda9fcb6
parent05340097e55b55f4ac504d5c917fdb41a1caf762 (diff)
downloadpuppet-puppet-30c9e2678d538a3db58f0ff3066cccced0b9cc33.tar.gz
puppet-puppet-30c9e2678d538a3db58f0ff3066cccced0b9cc33.tar.bz2
Using $puppetversion instead of $lsbdistcodename to determine puppet agent section in config file
-rw-r--r--manifests/puppetd.pp7
1 files changed, 3 insertions, 4 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index eb4d420..8ee47a1 100644
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -31,10 +31,9 @@ class puppetd inherits puppet {
}
# name of puppet agent section in config file
- $puppet_agent_section = $lsbdistcodename ? {
- 'lenny' => 'puppetd',
- 'lucid' => 'puppetd',
- default => 'agent',
+ $puppet_agent_section = $puppetversion ? {
+ '0.25.4' => 'puppetd',
+ default => 'agent',
}
# default config file for puppet nodes