diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 10:54:18 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 10:54:18 -0200 |
| commit | 385de80f16e833d15371467e2517585fc6402e63 (patch) | |
| tree | 21478816aeb51f65130440d5f59ab100a6d122fe | |
| parent | 86b607df557c663e6037a45aa629c136b54ffe42 (diff) | |
| download | puppet-puppet-385de80f16e833d15371467e2517585fc6402e63.tar.gz puppet-puppet-385de80f16e833d15371467e2517585fc6402e63.tar.bz2 | |
Using hiera for mongrel config
| -rw-r--r-- | manifests/master/mongrel.pp | 10 | ||||
| -rw-r--r-- | manifests/puppetmasterd.pp | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/manifests/master/mongrel.pp b/manifests/master/mongrel.pp index 4a7708d..987c333 100644 --- a/manifests/master/mongrel.pp +++ b/manifests/master/mongrel.pp @@ -1,14 +1,6 @@ # handles puppetmasterd service class puppet::master::mongrel { - case $puppetmaster_puppetmasters { - '': { $puppetmaster_puppetmasters = '4' } - } - - case $puppetmaster_port { - '': { $puppetmaster_port = '18140' } - } - # Include nginx include nginx::puppetmaster @@ -31,7 +23,7 @@ class puppet::master::mongrel { # restart the master from time to time to avoid memory problems # thanks to https://labs.riseup.net/code/projects/shared-puppet file { "/etc/cron.d/puppetmaster": - source => "puppet://$server/modules/puppet/cron.d/puppetmaster", + source => "puppet:///modules/puppet/cron.d/puppetmaster", owner => root, group => root, mode => 0644; diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp index 96fdb68..db73783 100644 --- a/manifests/puppetmasterd.pp +++ b/manifests/puppetmasterd.pp @@ -46,6 +46,9 @@ class puppetmasterd( } case $puppetmaster_servertype { + $puppetmaster_puppetmasters = hiera('puppet::master::worker_processes', 4) + $puppetmaster_port = hiera('puppet::master::port', '18140') + 'mongrel': { include puppet::master::mongrel } |