foreman_ansible 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275aa3a16113e61a5eaf4fdaf6dddb0db8ebd40f
-  data.tar.gz: 2926a08f5acb7551b2945bb1662bddd57151daeb
+  metadata.gz: 832a0aa23787c1f390fab13d3ecc3e58a60c6af6
+  data.tar.gz: 3ca0fcc13b040e9e36fb7a7d2b3ff9c4344d8b12
 SHA512:
-  metadata.gz: cd4524fc8bb4059abe867a4beea2c62e51e07560792fccbaa5e653ff4f09750451b36a3d5ab314ec873ab55853917302331e18a9c5bc8272653d1cfea3f69eb7
-  data.tar.gz: 746ea0fc1a44d761d323ab2077b0743169e88f00f4f338e50d8efeb4882ce3b7d9f1d6a76d0a9d913d325a26f0f64935031d3b6833419360f98e7cdcb3395b4c
+  metadata.gz: 73c63a710e5d0de08464f4a4e24fe65d782294b6f1eee55978235eb1df0d35378ad9336c919fe44d0e8c13849c610620d3a357352a51e6f770aa56d557f2ef98
+  data.tar.gz: 728a72b85aeda5be356c6c442b523fd36ffb0775a3a090dc83cd3623bd3145569f0fc6aa8aa136d937cba3b274832c0ebadcf5fe4fbf6df8dc7f09603d5c4f20

data/app/models/foreman_ansible/ansible_provider.rb

@@ -18,8 +18,9 @@ if defined? ForemanRemoteExecution
 
         def proxy_command_options(template_invocation, host)
           super(template_invocation, host).merge(
-            'ansible_inventory' =>
-              ::ForemanAnsible::InventoryCreator.new([host]).to_hash.to_json
+            'ansible_inventory' => ::ForemanAnsible::InventoryCreator.new(
+              [host], template_invocation
+            ).to_hash.to_json
           )
         end
       end

data/app/services/foreman_ansible/inventory_creator.rb

@@ -6,8 +6,9 @@ module ForemanAnsible
   class InventoryCreator
     attr_reader :hosts
 
-    def initialize(hosts)
+    def initialize(hosts, template_invocation)
       @hosts = hosts
+      @template_invocation = template_invocation
     end
 
     # It returns a hash in a format that Ansible understands.
@@ -21,7 +22,8 @@ module ForemanAnsible
       hosts = @hosts.map do |h|
         RemoteExecutionProvider.find_ip_or_hostname(h)
       end
-      { 'all' => { 'hosts' => hosts },
+      { 'all' => { 'hosts' => hosts,
+                   'vars'  => template_inputs(@template_invocation) },
         '_meta' => { 'hostvars' => hosts_vars } }
     end
 

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.freeze
 end

data/test/test_plugin_helper.rb

@@ -23,5 +23,7 @@ def assert_job_invocation_is_ok(response, targets)
   assert_response :created
 end
 plugin_factories_path = File.join(File.dirname(__FILE__), 'factories')
+rex_factories_path = "#{ForemanRemoteExecution::Engine.root}/test/factories"
+FactoryBot.definition_file_paths << rex_factories_path
 FactoryBot.definition_file_paths << plugin_factories_path
 FactoryBot.reload

data/test/unit/services/inventory_creator_test.rb

@@ -25,7 +25,6 @@ module ForemanAnsible
       @host.expects(:host_params).returns(extra_options).at_least_once
       inventory = ForemanAnsible::InventoryCreator.new(@host,
                                                        @template_invocation)
-
       assert_empty extra_options.to_a - inventory.connection_params(@host).to_a
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Daniel Lobato Garcia