foreman_ansible_core 3.0.1 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2a8033b0b49e4265b56fa56a0376ca02cde2f293a57c618039c60087014381
-  data.tar.gz: 98166355302fab2ab9d5624699cd6cfe6d880d6161b304b689f6410a1006c0f1
+  metadata.gz: 6d8f767c115d90811e6d131c931a3b26759a678b3cebce797735735c99deffb2
+  data.tar.gz: 7d51f480e657bcc0aaa6bbcfe8d24af0b18772468d384e09fdcacb4b3c13a705
 SHA512:
-  metadata.gz: 4ec94ef02708b8dd9403e630abf2f3f82a65503124dbcef17ee4f3ca9e78e663d9dd8b2ce89ea43d37641ec13c5b81cd2c96d25dbf7bf3b13b8fbad5d189631e
-  data.tar.gz: 199d21b8a88c256ece9fccc356f580f46d2334fbd87b7310f39043ebdce7560e37d10338ef73b34f4c7af24ed8940b556314faeba74c5206e8fa453a0ce7542c
+  metadata.gz: fd37c7c252342f558ae43153e0faa5f44c0a568ef5ecdad2a397ef210dc9708aa16627be056cd0b0c4d262aebce7ca95f5685e1f07dda52586530439bf1439c6
+  data.tar.gz: 0d57f0807a3324a7db4494ef9bc81149d3626b8beac521365be7b21146ee2c32a1f2d026d28af658db731621e78333f2eae6cd5dd8badf2b7e518f57aab78d4b

data/lib/foreman_ansible_core/runner/ansible_runner.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module ForemanAnsibleCore
   module Runner
     class AnsibleRunner < ForemanTasksCore::Runner::Parent
@@ -5,9 +7,10 @@ module ForemanAnsibleCore
 
       def initialize(input, suspended_action:)
         super input, :suspended_action => suspended_action
-        @inventory = rebuild_inventory(input)
+        @inventory = rebuild_secrets(rebuild_inventory(input), input)
         @playbook = input.values.first[:input][:action_input][:script]
         @root = working_dir
+        @verbosity_level = input.values.first[:input][:action_input][:verbosity_level]
       end
 
       def start
@@ -41,7 +44,7 @@ module ForemanAnsibleCore
         logger.debug("[foreman_ansible] - parsing event file #{event_file}")
         begin
           event = JSON.parse(File.read(event_file))
-          if (hostname = event['event_data']['host'])
+          if (hostname = event.dig('event_data', 'host'))
             handle_host_event(hostname, event)
           else
             handle_broadcast_data(event)
@@ -62,17 +65,23 @@ module ForemanAnsibleCore
         when 'runner_on_unreachable'
           publish_exit_status_for(hostname, 1)
         when 'runner_on_failed'
-          publish_exit_status_for(hostname, 2) if event['ignore_errors'].nil?
+          publish_exit_status_for(hostname, 2) if event.dig('event_data', 'ignore_errors').nil?
         end
       end
 
       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')
@@ -80,14 +89,14 @@ module ForemanAnsibleCore
       end
 
       def write_inventory
+        path = File.join(@root, 'inventory', 'hosts')
+        data_path = File.join(@root, 'data')
         inventory_script = <<~INVENTORY_SCRIPT
           #!/bin/sh
-          cat <<-EOS
-          #{JSON.dump(@inventory)}
-          EOS
+          cat #{::Shellwords.escape data_path}
         INVENTORY_SCRIPT
-        path = File.join(@root, 'inventory', 'hosts')
         File.write(path, inventory_script)
+        File.write(data_path, JSON.dump(@inventory))
         File.chmod(0o0755, path)
       end
 
@@ -97,10 +106,19 @@ module ForemanAnsibleCore
 
       def start_ansible_runner
         command = ['ansible-runner', 'run', @root, '-p', 'playbook.yml']
+        command << verbosity if verbose?
         initialize_command(*command)
         logger.debug("[foreman_ansible] - Running command '#{command.join(' ')}'")
       end
 
+      def verbosity
+        '-' + 'v' * @verbosity_level.to_i
+      end
+
+      def verbose?
+        @verbosity_level.to_i.positive?
+      end
+
       def prepare_directory_structure
         inner = %w[inventory project].map { |part| File.join(@root, part) }
         ([@root] + inner).each do |path|
@@ -120,7 +138,7 @@ module ForemanAnsibleCore
       def rebuild_inventory(input)
         action_inputs = input.values.map { |hash| hash[:input][:action_input] }
         hostnames = action_inputs.map { |hash| hash[:name] }
-        inventories = action_inputs.map { |hash| JSON.parse(hash[:ansible_inventory]) }
+        inventories = action_inputs.map { |hash| hash[:ansible_inventory] }
         host_vars = inventories.map { |i| i['_meta']['hostvars'] }.reduce(&:merge)
 
         { '_meta' => { 'hostvars' => host_vars },
@@ -138,6 +156,21 @@ module ForemanAnsibleCore
           Dir.mktmpdir(nil, File.expand_path(dir))
         end
       end
+
+      def rebuild_secrets(inventory, input)
+        input.each do |host, host_input|
+          secrets = host_input['input']['action_input']['secrets']
+          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']
+          }
+          inventory['_meta']['hostvars'][host].update(new_secrets)
+        end
+
+        inventory
+      end
     end
   end
 end

data/lib/foreman_ansible_core/runner/playbook.rb

@@ -14,7 +14,7 @@ module ForemanAnsibleCore
 
       def initialize(inventory, playbook, options = {}, suspended_action:)
         super :suspended_action => suspended_action
-        @inventory = inventory
+        @inventory = rebuild_secrets(inventory, options[:secrets])
         unknown_hosts.each do |host|
           add_to_known_hosts(host)
         end
@@ -52,7 +52,7 @@ module ForemanAnsibleCore
 
       def write_inventory
         ensure_directory(File.dirname(inventory_file))
-        File.write(inventory_file, @inventory)
+        File.write(inventory_file, JSON.dump(@inventory))
       end
 
       def write_playbook
@@ -103,7 +103,7 @@ module ForemanAnsibleCore
       end
 
       def unknown_hosts
-        JSON.parse(@inventory)['all']['hosts'].select do |host|
+        @inventory['all']['hosts'].select do |host|
           Net::SSH::KnownHosts.search_for(host).empty?
         end
       end
@@ -118,6 +118,20 @@ module ForemanAnsibleCore
         logger.error('[foreman_ansible] - Failed to save host key for '\
           "#{host}: #{e}")
       end
+
+      def rebuild_secrets(inventory, secrets)
+        inventory['all']['hosts'].each do |name|
+          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']
+          }
+          inventory['_meta']['hostvars'][name].update(new_secrets)
+        end
+
+        inventory
+      end
     end
   end
 end

data/lib/foreman_ansible_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.5
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -91,7 +91,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 +106,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: []