diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-20 14:23:14 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-20 14:23:14 -0300 |
| commit | 8645c26cba438b93737da57f9486a5ea50a46b7b (patch) | |
| tree | 6a2747bb4313a273b9887fd74470bcc387892937 | |
| parent | 9c83d350655d990d5f87a98fcfb73fbe2ac777fd (diff) | |
| download | puppet-puppet-8645c26cba438b93737da57f9486a5ea50a46b7b.tar.gz puppet-puppet-8645c26cba438b93737da57f9486a5ea50a46b7b.tar.bz2 | |
Introducing $puppetd_server
| -rw-r--r-- | manifests/puppetd.pp | 4 | ||||
| -rw-r--r-- | templates/puppet-node.conf.erb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp index 267f2dc..297bd89 100644 --- a/manifests/puppetd.pp +++ b/manifests/puppetd.pp @@ -13,6 +13,10 @@ class puppetd inherits puppet { '': { $puppetd_configtimeout = "120" } } + case $puppetd_server { + '': { $puppetd_server = "puppet.$domain" } + } + package { "puppet": ensure => installed, require => Package["cron"], diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb index 87f61fb..ac113bc 100644 --- a/templates/puppet-node.conf.erb +++ b/templates/puppet-node.conf.erb @@ -9,7 +9,7 @@ pluginsync = true [<%= puppet_agent_name %>] vardir = /var/lib/puppet ssldir = $vardir/ssl -server = puppet.<%= domain %> +server = <%= puppetd_server %> runinterval = <%= puppetd_runinterval %> puppetport = 8139 masterport = <%= puppetmaster_port %> |