(packaging) DO NOT MERGE THIS

Relax bolt version constraint to get a build for testing.
puppetlabs · Mar 26, 2020 · 6ea2da8 · 6ea2da8
1 parent 52043d2
commit 6ea2da8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/agentless-catalog-executor.gemspec b/agentless-catalog-executor.gemspec
@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
 
   # Pin concurrent-ruby to 1.1.5 until https://github.com/ruby-concurrency/concurrent-ruby/pull/856 is released
   spec.add_dependency "concurrent-ruby", "1.1.5"
-  # TODO: migrate to bolt 2.x
-  spec.add_dependency "bolt",  "~> 2.0"
+
+  #spec.add_dependency "bolt",  "~> 2.0"
+  # TODO: THIS IS ONLY TO GET A VANAGON BUILD!!! DO Not MERGE LIKE THiS, USE ^^
+  spec.add_dependency "bolt",  ">= 1"
 
   # server-side dependencies cargo culted from https://github.com/puppetlabs/bolt/blob/4418da408643aa7eb5ed64f4c9704b941ea878dc/Gemfile#L10-L16
   spec.add_dependency "hocon", ">= 1.2.5"

diff --git a/lib/ace/transport_app.rb b/lib/ace/transport_app.rb
@@ -224,7 +224,8 @@ def self.trusted_facts(certname)
         target_data = {
           'name' => body['target']['host'] || body['target']['name'] || 'remote',
           'config' => {
-            'transport' => 'remote'
+            'transport' => 'remote',
+            'remote' => body['target']
           }
         }
         target = [Bolt::Target.from_hash(target_data, inventory)]