The REST infrastructure now correctly the SSL certificates.

I don't think the whole thing is done, but at least the
basic flows are in place.  Now it's just a question of
doing real-world tests and fleshing out the unit tests
as necessary.

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb
index d33150fc2..77dd0538b 100644
--- a/lib/puppet/indirector/rest.rb
+++ b/lib/puppet/indirector/rest.rb
@@ -3,21 +3,20 @@ require 'uri'
 
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
-
     def rest_connection_details
         { :host => Puppet[:server], :port => Puppet[:masterport].to_i }
     end
 
     def network_fetch(path)
-        network {|conn| conn.get("/#{path}").body }
+        network.get("/#{path}").body
     end
     
     def network_delete(path)
-        network {|conn| conn.delete("/#{path}").body }
+        network.delete("/#{path}").body
     end
     
     def network_put(path, data)
-        network {|conn| conn.put("/#{path}", data).body }
+        network.put("/#{path}", data).body
     end
     
     def find(request)
@@ -46,8 +45,8 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     
   private
   
-    def network(&block)
-        Net::HTTP.start(rest_connection_details[:host], rest_connection_details[:port]) {|conn| yield(conn) }
+    def network
+        Puppet::Network::HttpPool.http_instance(rest_connection_details[:host], rest_connection_details[:port])
     end
   
     def exception?(yaml_string)