summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-11 15:04:54 -0500
committerLuke Kanies <luke@madstop.com>2008-04-11 15:04:54 -0500
commitd9846fc3f06f61fcb4b8806740f77747a7f6939e (patch)
treec730c26f4f42a02a2c6c2c4a78fe97601c1b19b9 /lib/puppet
parentcb617f20ed6e0af362937760f33f5ddc34e626ee (diff)
downloadpuppet-d9846fc3f06f61fcb4b8806740f77747a7f6939e.tar.gz
puppet-d9846fc3f06f61fcb4b8806740f77747a7f6939e.tar.xz
puppet-d9846fc3f06f61fcb4b8806740f77747a7f6939e.zip
Fixishing some pending tests, including filling in
the connection information.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/indirector/rest.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb
index 26f7736f3..d33150fc2 100644
--- a/lib/puppet/indirector/rest.rb
+++ b/lib/puppet/indirector/rest.rb
@@ -5,7 +5,7 @@ require 'uri'
class Puppet::Indirector::REST < Puppet::Indirector::Terminus
def rest_connection_details
- { :host => '127.0.0.1', :port => 34343 }
+ { :host => Puppet[:server], :port => Puppet[:masterport].to_i }
end
def network_fetch(path)
@@ -47,7 +47,7 @@ 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) }
+ Net::HTTP.start(rest_connection_details[:host], rest_connection_details[:port]) {|conn| yield(conn) }
end
def exception?(yaml_string)