foreman_ansible_core 3.0.4 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9ed358d85932fcb1710bc33ff885319f5478daa58083520749a99a2af67626
-  data.tar.gz: 9efdcf103ab555abb5ea60d1e8e757110a514d73a4dfa00bcd1f5cef68c81e0b
+  metadata.gz: 278c99763d5ca8b32972c482295e69eeb169361d9672676698f8e86b9fd7b280
+  data.tar.gz: 9685147c5aceff5a56228a6a1cb62bd68d3c70f8a86d8abf53c1a5d93c514ada
 SHA512:
-  metadata.gz: b1ab98aeae41f8232d6eef1d3057e332eae7c7716768f54862b259dd7aae4236c20a0b628e8164336fcdb9d30d7ff29387f3f72eb118dd6faa55a92a745c44fe
-  data.tar.gz: 0e1fc4865413fc4d5be78ad7a5e5b7741103aa22618cd419d2b52ed584042588faac547427bdc46447c5fcb354b1015b704e71e75123ff89a0cdcc2daa99785c
+  metadata.gz: ff78d8748767c661088e575b1085090e0d6f4c863422dd7facb00c26dc1bbc1b38afc81b3f39a0817a27ee1108db6efde79cd339176d18db18612dc08af3972a
+  data.tar.gz: 639a28fa06bce26cee23f746aed5192d7b909b81680b4186a4180d73f570742424e71bcaefa64e52db3405534604c339df2cf38d3c87fdd60b5eeb848811216c

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)
@@ -72,10 +80,16 @@ module ForemanAnsibleCore
       def handle_broadcast_data(event)
         log_event("broadcast", event)
         if event['event'] == 'playbook_on_stats'
+          failures = event.dig('event_data', 'failures') || {}
           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
+              publish_exit_status_for(host, 0)
+            end
           end
         else
           broadcast_data(event['stdout'] + "\n", 'stdout')
@@ -99,7 +113,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(' ')}'")
@@ -113,6 +130,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|
@@ -133,7 +154,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,
@@ -157,8 +183,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' => input['action_input'].slice('name') }
+      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.4'
+  VERSION = '4.1.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 4.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2021-07-20 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
@@ -91,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
@@ -106,8 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'
 test_files: []