foreman_ansible_core 3.0.5 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d8f767c115d90811e6d131c931a3b26759a678b3cebce797735735c99deffb2
-  data.tar.gz: 7d51f480e657bcc0aaa6bbcfe8d24af0b18772468d384e09fdcacb4b3c13a705
+  metadata.gz: f2a3786cc1745dadafd2d12dd0a38dfbb23e0ee19880c3f5bef7eb15c87993a0
+  data.tar.gz: 4a31b5d21235e36f4805c2b47e4f4dd6c7baec453393e7f546b2fc7c6ec612a8
 SHA512:
-  metadata.gz: fd37c7c252342f558ae43153e0faa5f44c0a568ef5ecdad2a397ef210dc9708aa16627be056cd0b0c4d262aebce7ca95f5685e1f07dda52586530439bf1439c6
-  data.tar.gz: 0d57f0807a3324a7db4494ef9bc81149d3626b8beac521365be7b21146ee2c32a1f2d026d28af658db731621e78333f2eae6cd5dd8badf2b7e518f57aab78d4b
+  metadata.gz: 5ea0819d7adc9d36166f507e3115b154d14954f7000ed00f1727940033e45e08990b17ad492e85332fd7129c1efc666c1cd64528d86b1c6b51f33392cfe85bce
+  data.tar.gz: 3c33ec4701cf6b2822800ed1d474bfa1ac344554c3cdb333822ae5ddc37a173f42b5a29127918ca99a8e1a64548ef20abbc34d06d0fe222f518f8d2407d6156f

data/lib/foreman_ansible_core/runner/ansible_runner.rb

@@ -8,9 +8,12 @@ module ForemanAnsibleCore
       def initialize(input, suspended_action:)
         super input, :suspended_action => suspended_action
         @inventory = rebuild_secrets(rebuild_inventory(input), input)
-        @playbook = input.values.first[:input][:action_input][:script]
+        action_input = input.values.first[:input][:action_input]
+        @playbook = action_input[:script]
         @root = working_dir
-        @verbosity_level = input.values.first[:input][:action_input][:verbosity_level]
+        @verbosity_level = action_input[:verbosity_level]
+        @rex_command = action_input[:remote_execution_command]
+        @check_mode = action_input[:check_mode]
       end
 
       def start
@@ -38,6 +41,11 @@ module ForemanAnsibleCore
         end
       end
 
+      def close
+        super
+        FileUtils.remove_entry(@root) if @tmp_working_dir
+      end
+
       private
 
       def handle_event_file(event_file)
@@ -79,9 +87,7 @@ module ForemanAnsibleCore
             publish_data_for(host, [header, line].join("\n"), 'stdout')
 
             # If the task has been rescued, it won't consider a failure
-            if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0
-              publish_exit_status_for(host, 0)
-            end
+            publish_exit_status_for(host, 0) if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0
           end
         else
           broadcast_data(event['stdout'] + "\n", 'stdout')
@@ -105,7 +111,10 @@ module ForemanAnsibleCore
       end
 
       def start_ansible_runner
-        command = ['ansible-runner', 'run', @root, '-p', 'playbook.yml']
+        env = {}
+        env['FOREMAN_CALLBACK_DISABLE'] = '1' if @rex_command
+        command = [env, 'ansible-runner', 'run', @root, '-p', 'playbook.yml']
+        command << '--cmdline' << '"--check"' if check_mode?
         command << verbosity if verbose?
         initialize_command(*command)
         logger.debug("[foreman_ansible] - Running command '#{command.join(' ')}'")
@@ -119,6 +128,10 @@ module ForemanAnsibleCore
         @verbosity_level.to_i.positive?
       end
 
+      def check_mode?
+        @check_mode == true
+      end
+
       def prepare_directory_structure
         inner = %w[inventory project].map { |part| File.join(@root, part) }
         ([@root] + inner).each do |path|
@@ -139,7 +152,12 @@ module ForemanAnsibleCore
         action_inputs = input.values.map { |hash| hash[:input][:action_input] }
         hostnames = action_inputs.map { |hash| hash[:name] }
         inventories = action_inputs.map { |hash| hash[:ansible_inventory] }
-        host_vars = inventories.map { |i| i['_meta']['hostvars'] }.reduce(&:merge)
+        host_vars = inventories.map { |i| i['_meta']['hostvars'] }.reduce({}) do |acc, hosts|
+          hosts.reduce(acc) do |inner_acc, (hostname, vars)|
+            vars[:ansible_ssh_private_key_file] ||= ForemanRemoteExecutionCore.settings[:ssh_identity_key_file]
+            inner_acc.merge(hostname => vars)
+          end
+        end
 
         { '_meta' => { 'hostvars' => host_vars },
           'all' => { 'hosts' => hostnames,
@@ -163,8 +181,8 @@ module ForemanAnsibleCore
           per_host = secrets['per-host'][host]
 
           new_secrets = {
-            'ansible_ssh_pass' => inventory['ssh_password'] || per_host['ansible_ssh_pass'],
-            'ansible_sudo_pass' => inventory['sudo_password'] || per_host['ansible_sudo_pass']
+            'ansible_password' => inventory['ssh_password'] || per_host['ansible_password'],
+            'ansible_become_password' => inventory['effective_user_password'] || per_host['ansible_become_password']
           }
           inventory['_meta']['hostvars'][host].update(new_secrets)
         end

data/lib/foreman_ansible_core/runner/playbook.rb

@@ -124,8 +124,8 @@ module ForemanAnsibleCore
           per_host = secrets['per-host'][name]
 
           new_secrets = {
-            'ansible_ssh_pass' => inventory['ssh_password'] || per_host['ansible_ssh_pass'],
-            'ansible_sudo_pass' => inventory['sudo_password'] || per_host['ansible_sudo_pass']
+            'ansible_password' => inventory['ssh_password'] || per_host['ansible_password'],
+            'ansible_become_password' => inventory['effective_user_password'] || per_host['ansible_become_password']
           }
           inventory['_meta']['hostvars'][name].update(new_secrets)
         end

data/lib/foreman_ansible_core/task_launcher/ansible_runner.rb

@@ -17,6 +17,12 @@ module ForemanAnsibleCore
         Runner::AnsibleRunner
       end
 
+      # Discard everything apart from hostname to be able to tell the actions
+      # apart when debugging
+      def transform_input(input)
+        { 'action_input' => super['action_input'].slice('name', :task_id) }
+      end
+
       # def self.input_format
       #   {
       #     $UUID => {

data/lib/foreman_ansible_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanAnsibleCore
-  VERSION = '3.0.5'
+  VERSION = '4.1.2'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 4.1.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: foreman_remote_execution_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: foreman_remote_execution_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement