foreman_ansible_core 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12eefd8c004fc5fab3ba89e55d6f55a012fd5a8d
-  data.tar.gz: 0f6c6dc40d70761dd0ae7febfbc7e30b19115d07
+  metadata.gz: c69f61506d641e18d27a22a32514cdb6221174dd
+  data.tar.gz: 9afe8696e6723ad9ab66adf416b457e8fa9dfec8
 SHA512:
-  metadata.gz: 283cbd551dba171fccfb7d3dd992a4e4f6c86dbd18f3cd2b1078eba877562c2af3d16457d33808cc4f90a8d4a5ffd95fd47edbff2ac09f3a6c2432e273d8d3f0
-  data.tar.gz: d04b049df94c5e507446998d6bb68c6667b3711574276e4544a3dbb27478d0ba1ee4f060f77d317cd61e4e852db96d68d1f716455aeea18a8112bb43eae59a23
+  metadata.gz: c40433c92f4c4f3d617562cad983a0b116b8240830bb14d6d641aa17187845dc1649a3e4da75f81af6485b66efffc69f8fc2a431212e938989c10fa54604ef3b
+  data.tar.gz: 7080dd69b55873db5305ba237dc7d5e7331cecd1e23c2969125eaf553e115573663205bf0fa46b5331686661330150c44a7dec6fc5278b5f9070498f87e83c5e

data/lib/foreman_ansible_core.rb

@@ -1,28 +1,39 @@
-require 'foreman_tasks_core'
-require 'foreman_remote_execution_core'
+begin
+  require 'foreman_tasks_core'
+  require 'foreman_remote_execution_core'
+# rubocop:disable Lint/HandleExceptions
+rescue LoadError
+  # These gems are not available in a proxy SCLed context
+  # puts 'Running Foreman Ansible Core in non-SCL context'
+end
+# rubocop:enable Lint/HandleExceptions
 
 # Core actions for Foreman Ansible, used by both Foreman and Foreman proxy
 # This comprises running playbooks for the moment
 module ForemanAnsibleCore
-  extend ForemanTasksCore::SettingsLoader
-  register_settings(:ansible, :ansible_dir => '/etc/ansible',
-                              :working_dir => nil)
   require 'foreman_ansible_core/exception'
+  require 'foreman_ansible_core/roles_reader'
+  require 'foreman_ansible_core/version'
 
-  if ForemanTasksCore.dynflow_present?
-    require 'foreman_tasks_core/runner'
-    require 'foreman_ansible_core/playbook_runner'
-    require 'foreman_ansible_core/actions'
-  end
+  if defined? ForemanTasksCore
+    extend ForemanTasksCore::SettingsLoader
+    register_settings(:ansible, :ansible_dir => Dir.home,
+                                :working_dir => nil)
 
-  require 'foreman_remote_execution_core/actions'
-  require 'foreman_ansible_core/remote_execution_core/ansible_runner'
-  require 'foreman_ansible_core/remote_execution_core/settings_override'
-  ForemanRemoteExecutionCore::Actions::RunScript.send(
-    :prepend,
-    ForemanAnsibleCore::RemoteExecutionCore::SettingsOverride
-  )
+    if ForemanTasksCore.dynflow_present?
+      require 'foreman_tasks_core/runner'
+      require 'foreman_ansible_core/playbook_runner'
+      require 'foreman_ansible_core/actions'
+    end
+  end
 
-  require 'foreman_ansible_core/roles_reader'
-  require 'foreman_ansible_core/version'
+  if defined? ForemanTasksCore
+    require 'foreman_remote_execution_core/actions'
+    require 'foreman_ansible_core/remote_execution_core/ansible_runner'
+    require 'foreman_ansible_core/remote_execution_core/settings_override'
+    ForemanRemoteExecutionCore::Actions::RunScript.send(
+      :prepend,
+      ForemanAnsibleCore::RemoteExecutionCore::SettingsOverride
+    )
+  end
 end

data/lib/foreman_ansible_core/command_creator.rb

@@ -1,23 +1,34 @@
 module ForemanAnsibleCore
   # Creates the actual command to be passed to foreman_tasks_core to run
   class CommandCreator
-    attr_reader :command
-
     def initialize(inventory_file, playbook_file, options = {})
       @options = options
-      @command = [{ 'JSON_INVENTORY_FILE' => inventory_file }]
-      @command << 'ansible-playbook'
-      @command = command_options(@command)
-      @command << playbook_file
+      @playbook_file = playbook_file
+      @inventory_file = inventory_file
+      command
+    end
+
+    def command
+      parts = [environment_variables]
+      parts << 'ansible-playbook'
+      parts.concat(command_options)
+      parts << @playbook_file
+      parts
     end
 
     private
 
-    def command_options(command)
-      command.concat(['-i', json_inventory_script])
-      command.concat([setup_verbosity]) if verbose?
-      command.concat(['-T', @options[:timeout]]) unless @options[:timeout].nil?
-      command
+    def environment_variables
+      defaults = { 'JSON_INVENTORY_FILE' => @inventory_file }
+      defaults['ANSIBLE_CALLBACK_WHITELIST'] = '' if rex_command?
+      defaults
+    end
+
+    def command_options
+      opts = ['-i', json_inventory_script]
+      opts.concat([setup_verbosity]) if verbose?
+      opts.concat(['-T', @options[:timeout]]) unless @options[:timeout].nil?
+      opts
     end
 
     def json_inventory_script
@@ -40,5 +51,9 @@ module ForemanAnsibleCore
         verbosity_level.to_i > 0
       # rubocop:enable Rails/Present
     end
+
+    def rex_command?
+      @options[:remote_execution_command]
+    end
   end
 end

data/lib/foreman_ansible_core/playbook_runner.rb

@@ -1,6 +1,7 @@
 require 'foreman_tasks_core/runner/command_runner'
 require_relative 'command_creator'
 require 'tmpdir'
+require 'net/ssh'
 
 module ForemanAnsibleCore
   # Implements ForemanTasksCore::Runner::Base interface for running
@@ -11,6 +12,9 @@ module ForemanAnsibleCore
     def initialize(inventory, playbook, options = {})
       super
       @inventory = inventory
+      unknown_hosts.each do |host|
+        add_to_known_hosts(host)
+      end
       @playbook  = playbook
       @options   = options
       initialize_dirs
@@ -94,5 +98,22 @@ module ForemanAnsibleCore
         !ansible_dir.nil? && File.exist?(ansible_dir)
       @ansible_dir = ansible_dir
     end
+
+    def unknown_hosts
+      JSON.parse(@inventory)['all']['hosts'].select do |host|
+        Net::SSH::KnownHosts.search_for(host).empty?
+      end
+    end
+
+    def add_to_known_hosts(host)
+      logger.warn("[foreman_ansible] - Host #{host} not found in known_hosts")
+      Net::SSH::Transport::Session.new(host).host_keys.each do |host_key|
+        Net::SSH::KnownHosts.add(host, host_key)
+      end
+      logger.warn("[foreman_ansible] - Added host key #{host} to known_hosts")
+    rescue StandardError => e
+      logger.error('[foreman_ansible] - Failed to save host key for '\
+                   "#{host}: #{e}")
+    end
   end
 end

data/lib/foreman_ansible_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanAnsibleCore
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: |2
       Ansible integration with Foreman - core parts for dealing with Ansible concepts,
       usable by foreman_ansible or smart_proxy_ansible to delegate the execution.
@@ -92,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'