diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-05-04 03:03:36 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-05-04 03:03:36 +0000 |
| commit | 58cfd1ec8f17c820d4977d0c1cf61fad331e4c7a (patch) | |
| tree | a274e23496d06447e5fe25539a39a66ef21aa4e1 | |
| parent | 18de80416934f05cfe7946d62f5ebad0e54ad34a (diff) | |
| download | puppet-58cfd1ec8f17c820d4977d0c1cf61fad331e4c7a.tar.gz puppet-58cfd1ec8f17c820d4977d0c1cf61fad331e4c7a.tar.xz puppet-58cfd1ec8f17c820d4977d0c1cf61fad331e4c7a.zip | |
Fixing the problem that lutter ran into; the issue seems to be that Facter could not find the ipaddress on the server.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1173 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | lib/puppet/server/master.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb index 95d81cdf6..5e9d880f1 100644 --- a/lib/puppet/server/master.rb +++ b/lib/puppet/server/master.rb @@ -25,8 +25,15 @@ class Server facts["serverversion"] = Puppet.version.to_s # And then add the server name and IP - facts["servername"] = Facter["hostname"].value - facts["serverip"] = Facter["ipaddress"].value + {"servername" => "hostname", + "serverip" => "ipaddress" + }.each do |var, fact| + if obj = Facter[fact] + facts[var] = obj.value + else + Puppet.warning "Could not retrieve fact %s" % fact + end + end end def filetimeout |