diff options
| author | Sam Quigley <sq@wesabe.com> | 2008-03-18 20:33:02 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-20 23:22:14 -0500 |
| commit | 54bedb2bbae2b84fc8f9df8b95e0a904a4e709f7 (patch) | |
| tree | e49a5c7ede184096e38fe92f8b230f22a44e7b6f /lib/puppet/network | |
| parent | a240969763e531a5a1cbcd0fd1c07319deb8edb8 (diff) | |
| download | puppet-54bedb2bbae2b84fc8f9df8b95e0a904a4e709f7.tar.gz puppet-54bedb2bbae2b84fc8f9df8b95e0a904a4e709f7.tar.xz puppet-54bedb2bbae2b84fc8f9df8b95e0a904a4e709f7.zip | |
tweak the (already applied) patch in 388cf7c3df7ce26e953949ed6fe63d76cbbb3691 to resolve #1137; also, add tests which detect the problem.
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/handler/master.rb | 2 |
1 files changed, 1 insertions, 1 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 |