foreman_ansible 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0adadc325dd31954f306695e4f6be32b13d6388db0893cfc2685a2bbb53df3
-  data.tar.gz: 7a3e2bf970e9ebff66219696b5bc4714853b109344d943e8d89d02f45b4b50c0
+  metadata.gz: '059c70bd67d597c230eea6135f738afd7c203c27cb1e1d1a7d5b3b88bada984f'
+  data.tar.gz: 2509eb475c69a745d46f726700a5308ee128823f90aaa8e852067b941797141e
 SHA512:
-  metadata.gz: d0ae153aa823b601fccf70886d3e6f036585010467c5df1233bb84c3851ca4fc2b5d83e7f3f4a89c796a38f0e1497c58c550d33777c480b058d5e8eafc9f9195
-  data.tar.gz: 83f7f0c912b9db4dda3a363690aaf49117581680a1638718410efe9f0c937ba9caae35599c04130ddcc10540a586af57215d279f959abda41aec4a4dd814a76b
+  metadata.gz: 212613afe4068af042fcb9340bddab879afd4c0b7ced2a6748861561cd76ed185609d2582fed69b03af76f7753b83cb5a18923f2d2170480a1deb3e17fb34338
+  data.tar.gz: 4134c4f15af8a5567ddc319978f5c1538e982bc83923d9ba8a1c45a524fb0d7628f236079d6355c9ab5f5d5ca931a85f1bd1c52673efb2ae2e7f2ed8a21d4b9d

data/app/models/foreman_ansible/ansible_provider.rb

@@ -35,7 +35,7 @@ if defined? ForemanRemoteExecution
           {
             'per-host' => {
               host.name => {
-                'ansible_ssh_pass' => rex_ssh_password(host),
+                'ansible_password' => rex_ssh_password(host),
                 'ansible_become_password' => rex_effective_user_password(host)
               }
             }

data/lib/foreman_ansible/version.rb

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

data/test/unit/ansible_provider_test.rb

@@ -40,7 +40,7 @@ class AnsibleProviderTest < ActiveSupport::TestCase
         host.expects(:params).twice.returns(params)
         secrets = ForemanAnsible::AnsibleProvider.secrets(host)
         host_secrets = secrets['per-host'][host.name]
-        assert_equal host_secrets['ansible_ssh_pass'], 'password'
+        assert_equal host_secrets['ansible_password'], 'password'
         assert_equal host_secrets['ansible_become_password'], 'letmein'
       end
     end

data/test/unit/lib/foreman_ansible_core/ansible_runner_test.rb

@@ -24,7 +24,7 @@ module ForemanAnsibleCore
             '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
         end
         let(:input) do
-          host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_become_password' => 'iamroot' }
+          host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
           secrets = { 'per-host' => { 'foreman.example.com' => host_secrets } }
           host_input = { 'input' => { 'action_input' => { 'secrets' => secrets } } }
           { 'foreman.example.com' => host_input }
@@ -35,14 +35,14 @@ module ForemanAnsibleCore
           test_inventory = inventory.merge('ssh_password' => 'sshpass', 'effective_user_password' => 'mypass')
           rebuilt = runner.send(:rebuild_secrets, test_inventory, input)
           host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-          assert_equal 'sshpass', host_vars['ansible_ssh_pass']
+          assert_equal 'sshpass', host_vars['ansible_password']
           assert_equal 'mypass', host_vars['ansible_become_password']
         end
 
         test 'host secrets are used when not overriden by inventory secrest' do
           rebuilt = runner.send(:rebuild_secrets, inventory, input)
           host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-          assert_equal 'letmein', host_vars['ansible_ssh_pass']
+          assert_equal 'letmein', host_vars['ansible_password']
           assert_equal 'iamroot', host_vars['ansible_become_password']
         end
       end

data/test/unit/lib/foreman_ansible_core/playbook_runner_test.rb

@@ -87,7 +87,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
         '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
     end
     let(:secrets) do
-      host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_become_password' => 'iamroot' }
+      host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
       { 'per-host' => { 'foreman.example.com' => host_secrets } }
     end
     let(:runner) { ForemanAnsibleCore::Runner::Playbook.allocate }
@@ -96,14 +96,14 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
       test_inventory = inventory.merge('ssh_password' => 'sshpass', 'effective_user_password' => 'mypass')
       rebuilt = runner.send(:rebuild_secrets, test_inventory, secrets)
       host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-      assert_equal 'sshpass', host_vars['ansible_ssh_pass']
+      assert_equal 'sshpass', host_vars['ansible_password']
       assert_equal 'mypass', host_vars['ansible_become_password']
     end
 
     test 'host secrets are used when not overriden by inventory secrest' do
       rebuilt = runner.send(:rebuild_secrets, inventory, secrets)
       host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-      assert_equal 'letmein', host_vars['ansible_ssh_pass']
+      assert_equal 'letmein', host_vars['ansible_password']
       assert_equal 'iamroot', host_vars['ansible_become_password']
     end
   end

data/test/unit/services/inventory_creator_test.rb

@@ -69,7 +69,7 @@ module ForemanAnsible
                    connection_params['ansible_winrm_server_cert_validation']
       assert_equal Setting['remote_execution_effective_user_method'],
                    connection_params['ansible_become_method']
-      refute connection_params.key?('ansible_ssh_pass')
+      refute connection_params.key?('ansible_password')
       refute connection_params.key?('ansible_become_password')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core