foreman_ansible 2.2.12 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a48bafe99b010006c5957a99968aff502c94ec9
-  data.tar.gz: 88055306424957d6613eaadce8fd4f94bc2b233f
+  metadata.gz: a81d01fef4d36b89f0ef6362d9700cb36de3d0fb
+  data.tar.gz: dd59fd6803183ebe157ca15c02afdae2799e45e1
 SHA512:
-  metadata.gz: 659f90c5b54a7a64d72c98e103a0f92b8050d0c27cd1fd7d8e9685dad2ae201001f4403609b6fb23985d666cfd2e2fda3dc180b866247806c9fac53512f13eac
-  data.tar.gz: 6be0b66ee9aa48b4d522ed4540c55cbc85b51df721267f15559189b14fc7110dd1ebb97124164415a4e3f1add43893879c4d7616583e8c5f3f6a9391e290af31
+  metadata.gz: '098bf3d8db153f6715b5a7190cf1a650672bb398a51850a7051cba75915e4632b9c38137ef6aa27c3d75186fffe0b6c95d6f6cd738cbba4d04b603a8175f9b40'
+  data.tar.gz: 98b2f3bb6dc64f683c432dabba2c516fb00211092c5e4d0a3c6f78dddc67b6ff4130ddcfb49483dda80bd5fdfe85866950d83e8bb60a4748e35b4a1dbdc53020

data/app/services/foreman_ansible/inventory_creator.rb

@@ -94,6 +94,7 @@ module ForemanAnsible
         'ansible_become_user' => @template_invocation.effective_user,
         'ansible_user' => host_setting(host, 'remote_execution_ssh_user'),
         'ansible_ssh_pass' => rex_ssh_password(host),
+        'ansible_sudo_pass' => rex_sudo_password(host),
         'ansible_ssh_private_key_file' => ansible_or_rex_ssh_private_key(host),
         'ansible_port' => host_setting(host, 'remote_execution_ssh_port')
       }
@@ -117,6 +118,11 @@ module ForemanAnsible
         host_setting(host, 'remote_execution_ssh_password')
     end
 
+    def rex_sudo_password(host)
+      @template_invocation.job_invocation.sudo_password ||
+        host_setting(host, 'remote_execution_sudo_password')
+    end
+
     def ansible_or_rex_ssh_private_key(host)
       ansible_private_file = host_setting(host, 'ansible_ssh_private_key_file')
       if !ansible_private_file.empty?

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.2.12'.freeze
+  VERSION = '2.2.13'.freeze
 end

data/test/unit/services/inventory_creator_test.rb

@@ -10,7 +10,8 @@ module ForemanAnsible
     setup do
       @host = FactoryBot.build(:host)
       @template_invocation = OpenStruct.new(
-        :job_invocation => OpenStruct.new(:password => 'foobar'),
+        :job_invocation => OpenStruct.new(:password => 'foobar',
+					 :sudo_password => 'foobar'),
         :effective_user => 'foobar'
       )
     end
@@ -41,6 +42,8 @@ module ForemanAnsible
         returns('root').at_least_once
       Setting.expects(:[]).with('remote_execution_ssh_password').
         returns('asafepassword').at_least_once
+      Setting.expects(:[]).with('remote_execution_sudo_password').
+        returns('foobar').at_least_once
       Setting.expects(:[]).with('ansible_winrm_server_cert_validation').
         returns(true).at_least_once
       Setting.expects(:[]).with('ansible_connection').
@@ -69,6 +72,8 @@ module ForemanAnsible
                    connection_params['ansible_port']
       assert_equal Setting['remote_execution_ssh_password'],
                    connection_params['ansible_ssh_pass']
+      assert_equal Setting['remote_execution_sudo_password'],
+                   connection_params['ansible_sudo_pass']
       assert_equal Setting['ansible_winrm_server_cert_validation'],
                    connection_params['ansible_winrm_server_cert_validation']
     end
@@ -80,6 +85,13 @@ module ForemanAnsible
                    inventory.rex_ssh_password(@host))
     end
 
+    test 'job invocation sudo password is passed when available' do
+      inventory = ForemanAnsible::InventoryCreator.new(@host,
+                                                       @template_invocation)
+      assert_equal(@template_invocation.job_invocation.sudo_password,
+                   inventory.rex_sudo_password(@host))
+    end
+
     test 'ssh private key is passed when available' do
       host = FactoryBot.build(:host)
       path_to_key = '/path/to/private/key'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.13
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop