Introducing $puppetd_server

diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 267f2dce8624f61d8c866b96520776bb3a6199ef..297bd89d4215be047253860f3ad06bf4a72aa0bb 100644 (file)
--- 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 87f61fbbe9ad2a3838cddb2ea3b841a7d19f5b0e..ac113bcb799dc6fd9286a3c95e32e67c2d59534f 100644 (file)
--- 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 %>