foreman_ansible_core 4.0.0 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6427ec31aba5a41a3ffa93168c761218f0aff53f97d08681c9d2cba431b50a9f
-  data.tar.gz: cc0a584af7801a24e3d66b679b840c968ab7851f38901abf37e5d26923d1eea9
+  metadata.gz: 1ca3b309e4ee2869e3eeca882b6e296a68728ec7f6722ff294dcba365c912ffc
+  data.tar.gz: 6215aa8ddb560b6d140873c7c390af83cca70af62a0a8571cf51f1d6b6db0bae
 SHA512:
-  metadata.gz: 1f4db115d787db1dc78d3eaa468b2972514005aa8d068fc0b98d73f7a07e159a5646a9cff4e5f9a19ed6de1ee4043f9f04379f69e82bdceb6a1b9ab5d8257f60
-  data.tar.gz: bb6bb793c4ea5d2f43af3ac1c3e545f39b574f32041cd141cd06e4c115e519c3e221449a7af0b4956627acf593792b63376d54dc922bd0ff69ba13ecd76924aa
+  metadata.gz: 8d507685ceb4cc8278ae333d4edc12fabd45a998123dd3c69158b88b0c7bd987ec792bd76b59b75f43e77a2b2db066595c3582895f6d9cf1be69bd6b36ac9ae7
+  data.tar.gz: 8968f788db24c21d1222d9c0729f88371d7469910c3429335290d6fd72cfbad4a9084373a227b27a4d72188de6abce473d7e3121838efdf7afaeb35b5c947e8b

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
@@ -77,10 +80,17 @@ module ForemanAnsibleCore
       def handle_broadcast_data(event)
         log_event("broadcast", event)
         if event['event'] == 'playbook_on_stats'
+          failures = event.dig('event_data', 'failures') || {}
+          unreachable = event.dig('event_data', 'dark') || {}
           header, *rows = event['stdout'].strip.lines.map(&:chomp)
           @outputs.keys.select { |key| key.is_a? String }.each do |host|
             line = rows.find { |row| row =~ /#{host}/ }
             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 && unreachable[host].to_i <= 0
+              publish_exit_status_for(host, 0)
+            end
           end
         else
           broadcast_data(event['stdout'] + "\n", 'stdout')
@@ -104,7 +114,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(' ')}'")
@@ -118,6 +131,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|
@@ -138,7 +155,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,

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 = '4.0.0'
+  VERSION = '4.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.3
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution_core
@@ -77,7 +77,7 @@ homepage: https://github.com/theforeman/foreman_ansible
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'
 test_files: []