foreman_ansible_core 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 61eb151e42e1f8d309d82914c001d3ea533255702176c5be70c1d465577aff15
-  data.tar.gz: 9001d911f362e894629d10721fa916287a6305576c81c3b8dd22894fffe9b71d
+SHA1:
+  metadata.gz: c69f61506d641e18d27a22a32514cdb6221174dd
+  data.tar.gz: 9afe8696e6723ad9ab66adf416b457e8fa9dfec8
 SHA512:
-  metadata.gz: 5b212d6da9a5d72dca9d83a2c14fed8e65fdd51dbeadd36578ce8a2a266510fb785469def88d0d00e018fbffab8d08069fce49628cf6426fcb1d4489b78c8705
-  data.tar.gz: ee82571d20690e764506ccf82a06563ddd7287c4c56dbd065fb6c635a6cb7bec9e0ebd3f9c3a4033c990ea871aa16af280f5940836b7f4a374758560703a12c8
+  metadata.gz: c40433c92f4c4f3d617562cad983a0b116b8240830bb14d6d641aa17187845dc1649a3e4da75f81af6485b66efffc69f8fc2a431212e938989c10fa54604ef3b
+  data.tar.gz: 7080dd69b55873db5305ba237dc7d5e7331cecd1e23c2969125eaf553e115573663205bf0fa46b5331686661330150c44a7dec6fc5278b5f9070498f87e83c5e

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/version.rb

@@ -1,3 +1,3 @@
 module ForemanAnsibleCore
-  VERSION = '2.1.0'.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.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'