foreman_ansible 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 04ef2672d90809de50a458709449a10b393e8b4cf2eae9c1d905682822ecac82
-  data.tar.gz: 1aadd4214a4d53962dfffc9014ae05168c8125ea7a3addc34235d29333c7c30e
+SHA1:
+  metadata.gz: bf20c117b247b7bac631b02cdf847af6e29a5eb6
+  data.tar.gz: cfc11ffafe093538f48322fbd581110e34be83a4
 SHA512:
-  metadata.gz: ae214b5e3516d85af5cb3ade922061ced9e797b39e078cfe63db3b87cc11faf817186aff3230704f2d7d501e5b0d08ccd2e042289a2ef8ae22a430ac6e09f369
-  data.tar.gz: 3a91c4fdb49e342f20a709aaa5e9083e77af70bca95738e8aa0e2bb53441cde66e2f662351a65f2b2195b3cc365ef9793616281ecb35c17f63f0d904c541ee05
+  metadata.gz: 1948c441fdfe3002aee7e94abf2b0e742d0d1bd24c6a13405c72f347eb1111baf245343cd3ffb1718ae78f535b422b228964981b0b8cff2a0425c917b238f7b4
+  data.tar.gz: a804813c0baceb26837bb63f25d24bd57d912a74184a143ddb08127afbbc8f831c41f89dfd3f0438a8534e6b32ff3da697c213748f9d83d2bc699dc4a94fa451

data/Rakefile

@@ -21,6 +21,8 @@ rescue StandardError => _
   puts 'Rubocop not loaded.'
 end
 
+Bundler::GemHelper.install_tasks :name => 'foreman_ansible'
+
 task :default do
   Rake::Task['rubocop'].execute
 end

data/app/models/foreman_ansible/ansible_provider.rb

@@ -20,9 +20,19 @@ if defined? ForemanRemoteExecution
           super(template_invocation, host).merge(
             'ansible_inventory' => ::ForemanAnsible::InventoryCreator.new(
               [host], template_invocation
-            ).to_hash.to_json
+            ).to_hash.to_json,
+            :remote_execution_command => ansible_command?(
+              template_invocation.template
+            )
           )
         end
+
+        private
+
+        def ansible_command?(template)
+          template.remote_execution_features.
+            where(:label => 'ansible_run_host').empty?
+        end
       end
     end
   end

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/test/unit/ansible_provider_test.rb

@@ -0,0 +1,35 @@
+require 'test_plugin_helper'
+
+# Tests for the behavior of Ansible Role, currently only validations
+class AnsibleProviderTest < ActiveSupport::TestCase
+  describe '.proxy_command_options' do
+    let(:template_invocation) { FactoryBot.create(:template_invocation) }
+    let(:dummyhost) { FactoryBot.create(:host) }
+
+    it 'adds an ansible inventory' do
+      assert command_options['ansible_inventory']
+    end
+
+    context 'when it is not using the ansible_run_host feature' do
+      it 'sets enables :remote_execution_command to true' do
+        assert command_options[:remote_execution_command]
+      end
+    end
+
+    context 'when it is using the ansible_run_host feature' do
+      let(:rex_feature) do
+        RemoteExecutionFeature.where(:label => 'ansible_run_host').first
+      end
+
+      it 'has remote_execution_command false' do
+        template_invocation.template.remote_execution_features << rex_feature
+        assert_not command_options[:remote_execution_command]
+      end
+    end
+
+    def command_options
+      ForemanAnsible::AnsibleProvider.
+        proxy_command_options(template_invocation, dummyhost)
+    end
+  end
+end

data/test/unit/lib/foreman_ansible_core/command_creator_test.rb

@@ -0,0 +1,62 @@
+require 'test_helper'
+
+class CommandCreatorTest < ActiveSupport::TestCase
+  let(:inventory_file) { 'test_inventory' }
+  let(:playbook_file) { 'test_palybook.yml' }
+  subject do
+    ForemanAnsibleCore::CommandCreator.new(inventory_file, playbook_file, {})
+  end
+
+  test 'returns a command array including the ansible-playbook command' do
+    assert command_parts.include?('ansible-playbook')
+  end
+
+  test 'the last argument is the playbook_file' do
+    assert command_parts.last == playbook_file
+  end
+
+  describe 'environment variables' do
+    let(:environment_variables) { subject.command.first }
+
+    test 'has a JSON_INVENTORY_FILE set' do
+      assert environment_variables['JSON_INVENTORY_FILE']
+    end
+
+    test 'has no ANSIBLE_CALLBACK_WHITELIST set by default' do
+      assert_not environment_variables['ANSIBLE_CALLBACK_WHITELIST']
+    end
+
+    test 'with a REX command it sets ANSIBLE_CALLBACK_WHITELIST to empty' do
+      set_command_options(:remote_execution_command, true)
+      assert environment_variables['ANSIBLE_CALLBACK_WHITELIST']
+    end
+  end
+
+  describe 'command options' do
+    it 'can have verbosity set' do
+      level = '3'
+      level_string = Array.new(level.to_i).map { 'v' }.join
+      set_command_options(:verbosity_level, level)
+      assert command_parts.any? do |part|
+        part == "-#{level_string}"
+      end
+    end
+
+    it 'can have a timeout set' do
+      timeout = '5555'
+      set_command_options(:timeout, timeout)
+      assert command_parts.include?(timeout)
+    end
+  end
+
+  private
+
+  def command_parts
+    subject.command.flatten.map(&:to_s)
+  end
+
+  def set_command_options(option, value)
+    subject.instance_eval("@options[:#{option}] = \"#{value}\"",
+                          __FILE__, __LINE__ - 1)
+  end
+end

data/test/unit/lib/foreman_ansible_core/playbook_runner_test.rb

@@ -7,7 +7,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
     test 'reads default when none provided' do
       ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:unknown_hosts).
         returns([])
-      File.expects(:exist?).with('/etc/ansible').returns(true)
+      File.expects(:exist?).with(Dir.home).returns(true)
       runner = ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
       assert '/etc/ansible', runner.instance_variable_get('@ansible_dir')
     end
@@ -21,7 +21,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
 
     test 'creates temp one if not provided' do
       Dir.expects(:mktmpdir)
-      File.expects(:exist?).with('/etc/ansible').returns(true)
+      File.expects(:exist?).with(Dir.home).returns(true)
       ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -201,6 +201,7 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/ansible_role_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
@@ -208,6 +209,7 @@ files:
 - test/unit/helpers/ansible_reports_helper_test.rb
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
+- test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/foreman_ansible_core/roles_reader_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
@@ -242,40 +244,42 @@ 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)
 test_files:
+- test/unit/host_ansible_role_test.rb
+- test/unit/helpers/ansible_reports_helper_test.rb
 - test/unit/ansible_role_test.rb
+- test/unit/concerns/config_reports_extensions_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
+- test/unit/lib/foreman_ansible_core/command_creator_test.rb
+- test/unit/lib/foreman_ansible_core/roles_reader_test.rb
+- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
-- test/unit/services/api_roles_importer_test.rb
-- test/unit/services/fact_sparser_test.rb
-- test/unit/services/insights_plan_runner_test.rb
-- test/unit/services/structured_fact_importer_test.rb
+- test/unit/services/fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/services/fact_parser_test.rb
 - test/unit/services/roles_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/fact_parser_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/structured_fact_importer_test.rb
+- test/unit/services/fact_sparser_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
 - test/unit/actions/run_ansible_job_test.rb
-- test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
-- test/unit/lib/foreman_ansible_core/roles_reader_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/concerns/config_reports_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_roles.rb
 - test/test_plugin_helper.rb
-- test/fixtures/insights_playbook.yaml
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
-- test/functional/ansible_roles_controller_test.rb
+- test/functional/hosts_controller_test.rb
+- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
-- test/functional/api/v2/hosts_controller_test.rb
-- test/functional/hosts_controller_test.rb
+- test/functional/ansible_roles_controller_test.rb
+- test/factories/ansible_roles.rb
+- test/factories/ansible_proxy.rb
+- test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/fixtures/insights_playbook.yaml