diff options
| author | mh <mh@immerda.ch> | 2010-08-08 22:17:23 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-08 22:17:23 +0200 |
| commit | fa22657268eca9fa369e8c9ca31032c38e948e4b (patch) | |
| tree | b2479e7574b8ff0111fbaf0495ef5184f3023eed /manifests/base.pp | |
| parent | 1d7bd1ff3bd49d7d1348005bed8bba56431329f5 (diff) | |
add 2.6 configuration for client
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 267be61..0c5b2b7 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,11 +1,15 @@ class puppet::base { if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } + $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1') + file { 'puppet_config': path => "$puppet_config", source => [ "puppet:///modules/site-puppet/client/${fqdn}/puppet.conf", "puppet:///modules/site-puppet/client/puppet.conf.$operatingsystem", "puppet:///modules/site-puppet/client/puppet.conf", + "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.$operatingsystem", + "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf", "puppet:///modules/puppet/client/puppet.conf.$operatingsystem", "puppet:///modules/puppet/client/puppet.conf" ], notify => Service[puppet], |