Updating the config generation stuff a bit, mostly just cleanup, but also changing the servername fact to be the fqdn of the server.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2321 980ebf18-57e1-0310-9a29-db15c13687c0

3 files changed, 8 insertions, 6 deletions

diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
index c08acabb1..13f1878fd 100644
--- a/lib/puppet/network/client.rb
+++ b/lib/puppet/network/client.rb
@@ -78,6 +78,7 @@ class Puppet::Network::Client
         driverparam = self.class.drivername
         if hash.include?(:Server)
             args = {:Server => hash[:Server]}
+            @server = hash[:Server]
             args[:Port] = hash[:Port] || Puppet[:masterport]
 
             @driver = self.class.xmlrpc_client.new(args)
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb
index d568b8ae7..a75410256 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/network/client/master.rb
@@ -174,8 +174,10 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         if self.objects or FileTest.exists?(self.cachefile)
             if self.fresh?(facts)
                 Puppet.info "Config is up to date"
-                unless self.objects
-                    oldtext = self.retrievecache
+                if self.objects
+                    return
+                end
+                if oldtext = self.retrievecache
                     begin
                         @objects = YAML.load(oldtext).to_type
                     rescue => detail
@@ -278,7 +280,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         if FileTest.exists?(self.cachefile)
             return ::File.read(self.cachefile)
         else
-            return ""
+            return nil
         end
     end
 
@@ -597,8 +599,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
 
         fromcache = false
         if textobjects == ""
-            textobjects = self.retrievecache
-            if textobjects == ""
+            unless textobjects = self.retrievecache
                 raise Puppet::Error.new(
                     "Cannot connect to server and there is no cached configuration"
                 )
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 2b0a215d0..c728638b2 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -24,7 +24,7 @@ class Puppet::Network::Handler
             facts["serverversion"] = Puppet.version.to_s
 
             # And then add the server name and IP
-            {"servername" => "hostname",
+            {"servername" => "fqdn",
                 "serverip" => "ipaddress"
             }.each do |var, fact|
                 if obj = Facter[fact]