diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
| commit | a8592f1009040ebf30a98268610915cc33bb3f63 (patch) | |
| tree | 49f61323a8536d58ce332e97b882677f55727df7 /lib/puppet/network/handler | |
| parent | e1907798425a7b163ac1b831b0cf11e88985815e (diff) | |
| parent | 491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff) | |
| download | puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.gz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.xz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.zip | |
Merge branch '0.24.x'
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
Diffstat (limited to 'lib/puppet/network/handler')
| -rw-r--r-- | lib/puppet/network/handler/master.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/network/handler/report.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 3e004046e..dabfaca50 100644 --- a/lib/puppet/network/handler/master.rb +++ b/lib/puppet/network/handler/master.rb @@ -81,9 +81,9 @@ class Puppet::Network::Handler clientip = facts["ipaddress"] if Puppet[:node_name] == 'cert' if name + client = name facts["fqdn"] = client facts["hostname"], facts["domain"] = client.split('.', 2) - client = name end if ip clientip = ip diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb index 8ddeed9f6..b92b77ea5 100755 --- a/lib/puppet/network/handler/report.rb +++ b/lib/puppet/network/handler/report.rb @@ -79,7 +79,8 @@ class Puppet::Network::Handler # Handle the parsing of the reports attribute. def reports - Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/) + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + x = Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/) end end end |