Feature #3394 REST runner, execution

puppetrun uses REST to trigger puppet runs.

1 files changed, 13 insertions, 11 deletions

diff --git a/lib/puppet/application/run.rb b/lib/puppet/application/run.rb
index f08fade8d..26ca362ff 100644
--- a/lib/puppet/application/run.rb
+++ b/lib/puppet/application/run.rb
@@ -112,14 +112,22 @@ Puppet::Application.new(:run) do
                 next
             end
         end
-        client = Puppet::Network::Client.runner.new(
-            :Server => host,
-            :Port => Puppet[:puppetport]
-        )
+
+        require 'puppet/run'
+        Puppet::Run.indirection.terminus_class = :rest
+        port = Puppet[:puppetport]
+        url = ["https://#{host}:#{port}", "production", "run", host].join('/')
 
         print "Triggering %s\n" % host
         begin
-            result = client.run(@tags, options[:ignoreschedules] || false, options[:foreground] || false)
+            request = Puppet::Indirector::Request.new(:run, :save, url) # Yuck.
+            run_options = {
+                :tags => @tags,
+                :background => ! options[:foreground],
+                :ignoreschedules => options[:ignoreschedules]
+            }
+            run = Puppet::Run.new( run_options ).save( request )
+            result = run.status
         rescue => detail
             puts detail.backtrace if Puppet[:trace]
             $stderr.puts "Host %s failed: %s\n" % [host, detail]
@@ -183,12 +191,6 @@ Puppet::Application.new(:run) do
             exit(24)
         end
 
-        if @tags.empty?
-            @tags = ""
-        else
-            @tags = @tags.join(",")
-        end
-
         @children = {}
 
         # If we get a signal, then kill all of our children and get out.