foreman_ansible_core 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7ce49a1cf3b78d977912a6f0887b3c831b34cb2
-  data.tar.gz: 2ec5f24efd9da511e2670fcd1706b9606e004360
+SHA256:
+  metadata.gz: 6427ec31aba5a41a3ffa93168c761218f0aff53f97d08681c9d2cba431b50a9f
+  data.tar.gz: cc0a584af7801a24e3d66b679b840c968ab7851f38901abf37e5d26923d1eea9
 SHA512:
-  metadata.gz: 3b9b755f323be085fd78f46dfad781c77e57c34629bb45238024bb9125c5d0cbced2010dc41cc51060f9f78486f11946dc18a049d49a397ea6672d126c04547a
-  data.tar.gz: '02930ac4dc9f53b2e41dbd34225988ca9ff1a9d1693fe6bb77aa8758be610c7df4e07d61b86e2f74862ef8f3653389882514df6cf9123f6036ce00871484e4aa'
+  metadata.gz: 1f4db115d787db1dc78d3eaa468b2972514005aa8d068fc0b98d73f7a07e159a5646a9cff4e5f9a19ed6de1ee4043f9f04379f69e82bdceb6a1b9ab5d8257f60
+  data.tar.gz: bb6bb793c4ea5d2f43af3ac1c3e545f39b574f32041cd141cd06e4c115e519c3e221449a7af0b4956627acf593792b63376d54dc922bd0ff69ba13ecd76924aa

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
@@ -35,13 +38,18 @@ module ForemanAnsibleCore
         end
       end
 
+      def close
+        super
+        FileUtils.remove_entry(@root) if @tmp_working_dir
+      end
+
       private
 
       def handle_event_file(event_file)
         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)
@@ -57,10 +65,12 @@ module ForemanAnsibleCore
         log_event("for host: #{hostname.inspect}", event)
         publish_data_for(hostname, event['stdout'] + "\n", 'stdout') if event['stdout']
         case event['event']
+        when 'runner_on_ok'
+          publish_exit_status_for(hostname, 0) if @exit_statuses[hostname].nil?
         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
 
@@ -78,14 +88,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
 
@@ -95,10 +105,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|
@@ -118,7 +137,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 },
@@ -136,6 +155,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_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
+
+        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_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
+
+        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.0'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2020-12-10 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
@@ -106,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'