foreman_ansible 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce7360304fa351ed3cb712937e4c9eb67ea4308f
-  data.tar.gz: 73bca3ba994f80ebdac9e109156a6c6b235e3cf4
+  metadata.gz: 00bb7f9d29564fb8e61f81e7406c05c50f185fbb
+  data.tar.gz: 6c4404d0e53c1fe991a08760af23243ce62fb542
 SHA512:
-  metadata.gz: 60674fb5b6e5e5eb4eb9638049c10d48f4dc79128babe895a45e42a7966976ccb5e5d3132e41f16b0b00d568951e59eb7d406ebf0684492338d2e8af7c81b564
-  data.tar.gz: 4f4655dff0cebf53f34488937737048b3fa6766dbdb668096856c6b3f1aa922618ac50ccf61674573f38146aeac626c6f12a6fe7b3350db274dae6b0da2e3024
+  metadata.gz: 5b13f77fa365d11d96e51da73e7cf72ac86335314a156de1b7ad7e7841efa172bbce7d69fb7820aab791f9563ec3fd5b4a2c7020fb6b08dcd966f22bb497fa90
+  data.tar.gz: 5d40a1a231244b4ed0efde3041946305385022a25a29994601eff5f29c8e4cb68faf509b6fa68078aae3707f2f0a6819ca3f4ddfa33aadb8915de0de484f09c0

data/Rakefile

@@ -6,7 +6,7 @@ rescue LoadError
 end
 
 require 'rake/testtask'
-Rake::TestTask.new("test:core") do |test|
+Rake::TestTask.new('test:core') do |test|
   test_dir = File.join(File.dirname(__FILE__), 'test/lib')
   test.pattern = "#{test_dir}/**/*_test.rb"
   test.libs << test_dir

data/app/controllers/ansible_roles_controller.rb

@@ -49,7 +49,7 @@ class AnsibleRolesController < ::ApplicationController
   end
 
   def no_changed_roles_message
-    return _('No changes in roles detected.') unless @proxy.present?
+    return _('No changes in roles detected.') if @proxy.blank?
     _('No changes in roles detected on %s.') % @proxy.name
   end
 end

data/app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb

@@ -10,9 +10,9 @@ module ForemanAnsible
         # cannot extend the method properly.
         # rubocop:disable BlockLength
         included do
-          api :POST, '/hostgroups/play_roles',
-              N_('Plays Ansible roles on hostgroups')
-          param :id, Array, :required => true
+          api :POST, '/hostgroups/:id/play_roles',
+              N_('Plays Ansible roles on a hostgroup')
+          param :id, String, :required => true
 
           def play_roles
             find_resource

data/app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb

@@ -7,7 +7,8 @@ module ForemanAnsible
         include ForemanTasks::Triggers
 
         included do
-          api :POST, '/hosts/:id/play_roles', N_('Plays Ansible roles on hosts')
+          api :POST, '/hosts/:id/play_roles',
+              N_('Plays Ansible roles on a host')
           param :id, String, :required => true
 
           def play_roles

data/app/controllers/foreman_ansible/concerns/hosts_controller_extensions.rb

@@ -5,6 +5,10 @@ module ForemanAnsible
       extend ActiveSupport::Concern
       include ForemanTasks::Triggers
 
+      included do
+        alias_method_chain :action_permission, :ansible
+      end
+
       def play_roles
         find_resource
         task = async_task(::Actions::ForemanAnsible::PlayHostRoles, @host)
@@ -25,12 +29,12 @@ module ForemanAnsible
 
       private
 
-      def action_permission
+      def action_permission_with_ansible
         case params[:action]
         when 'multiple_play_roles', 'play_roles'
           :view
         else
-          super
+          action_permission_without_ansible
         end
       end
     end

data/app/helpers/foreman_ansible/ansible_roles_helper.rb

@@ -3,17 +3,24 @@ module ForemanAnsible
   module AnsibleRolesHelper
     def ansible_proxy_links(hash, classes = nil)
       links = SmartProxy.with_features('Ansible').map do |proxy|
-        display_link_if_authorized(_('Import from %s') % proxy.name,
+        display_link_if_authorized(_('From %s') % proxy.name,
                                    hash.merge(:proxy => proxy),
                                    :class => classes)
       end.flatten
-      links.unshift display_link_if_authorized(_('Import from Foreman host'),
+      host_text = if links.any?
+                    _('From Foreman host')
+                  else
+                    _('Import from Foreman host')
+                  end
+      links.unshift display_link_if_authorized(host_text,
                                                hash,
                                                :class => classes)
     end
 
     def ansible_proxy_import(hash)
-      select_action_button(_('Import'), {}, ansible_proxy_links(hash))
+      select_action_button(_('Import'),
+                           { :primary => true, :class => 'roles-import' },
+                           ansible_proxy_links(hash))
     end
 
     def import_time(role)

data/app/helpers/foreman_ansible/hosts_helper_extensions.rb

@@ -15,7 +15,7 @@ module ForemanAnsible
 
     def ansible_roles_button(host)
       link_to(
-        icon_text('play', ' ' + _('Ansible roles'), :kind => 'fa'),
+        _('Run Ansible roles'),
         play_roles_host_path(:id => host.id),
         :id => :ansible_roles_button,
         :class => 'btn btn-default',

data/app/lib/actions/foreman_ansible/play_host_roles.rb

@@ -23,10 +23,9 @@ module Actions
       end
 
       def humanized_input
-        _('on host %{name} through %{proxy}') % {
-          :name => input.fetch(:host, {})[:name],
-          :proxy => running_proxy_name
-        }
+        format(_('on host %{name} through %{proxy}'),
+               :name => input.fetch(:host, {})[:name],
+               :proxy => running_proxy_name)
       end
 
       private

data/app/lib/actions/foreman_ansible/play_hostgroup_roles.rb

@@ -23,10 +23,9 @@ module Actions
       end
 
       def humanized_input
-        _('on host group %{name} through proxy %{proxy}') % {
-          :name => input.fetch(:hostgroup, {})[:name],
-          :proxy => running_proxy_name
-        }
+        format(_('on host group %{name} through proxy %{proxy}'),
+               :name => input.fetch(:hostgroup, {})[:name],
+               :proxy => running_proxy_name)
       end
 
       private

data/app/models/ansible_role.rb

@@ -1,5 +1,5 @@
 # Simple model to store basic info about the Ansible role
-class AnsibleRole < ActiveRecord::Base
+class AnsibleRole < ApplicationRecord
   include Authorizable
 
   self.include_root_in_json = false

data/app/models/host_ansible_role.rb

@@ -1,5 +1,5 @@
 # Join model that hosts the connection between hosts and ansible_roles
-class HostAnsibleRole < ActiveRecord::Base
+class HostAnsibleRole < ApplicationRecord
   audited :associated_with => :host, :allow_mass_assignment => true
   belongs_to_host
   belongs_to :ansible_role

data/app/models/hostgroup_ansible_role.rb

@@ -1,5 +1,5 @@
 # Join model that hosts the connection between hostgroups and ansible_roles
-class HostgroupAnsibleRole < ActiveRecord::Base
+class HostgroupAnsibleRole < ApplicationRecord
   belongs_to :hostgroup
   belongs_to :ansible_role
 

data/app/models/setting/ansible.rb

@@ -15,19 +15,28 @@ class Setting
             set(
               'ansible_port',
               N_('Use this port to connect to hosts '\
-                 'and run Ansible. You can override this on hosts'\
-                ' by adding a parameter "ansible_port"'),
+                 'and run Ansible. You can override this on hosts '\
+                 'by adding a parameter "ansible_port"'),
               22,
               N_('Port')
             ),
             set(
               'ansible_user',
-              N_('Foreman will try to connect to hosts as this user by default'\
-                 ' when running Ansible playbooks. You can override this '\
-                 ' on hosts by adding a parameter "ansible_user"'),
+              N_('Foreman will try to connect to hosts as this user by '\
+                 'default when running Ansible playbooks. You can '\
+                 'override this on hosts by adding a parameter '\
+                 '"ansible_user"'),
               'root',
               N_('User')
             ),
+            set(
+              'ansible_become',
+              N_('Foreman will use the sudo command to run roles on hosts '\
+                 'You can override this on hosts by adding a parameter '\
+                 '"ansible_become"'),
+              true,
+              N_('Become')
+            ),
             set(
               'ansible_ssh_pass',
               N_('Use this password by default when running Ansible '\
@@ -36,6 +45,15 @@ class Setting
               'ansible',
               N_('Password')
             ),
+            set(
+              'ansible_ssh_private_key_file',
+              N_('Use this to supply a path to an SSH Private Key '\
+                 'that Ansible will use in lieu of a password '\
+                 'Override with "ansible_ssh_private_key_file" '\
+                 'host parameter'),
+              '',
+              N_('Private Key Path')
+            ),
             set(
               'ansible_connection',
               N_('Use this connection type by default when running '\
@@ -81,7 +99,7 @@ class Setting
             create(s.update(:category => 'Setting::Ansible'))
           end
         end
-
+        Setting::BLANK_ATTRS.push('ansible_ssh_private_key_file')
         true
       end
 

data/app/services/foreman_ansible/fact_importer.rb

@@ -31,7 +31,7 @@ module ForemanAnsible
     end
 
     def add_missing_facts(imported_facts, parent = nil, prefix = '')
-      imported_facts.select! { |_fact_name, fact_value| !fact_value.nil? }
+      imported_facts.reject! { |_fact_name, fact_value| fact_value.nil? }
 
       imported_facts.each do |imported_name, imported_value|
         fact_fqn = fact_fqn(imported_name, prefix)

data/app/services/foreman_ansible/fact_parser.rb

@@ -18,19 +18,19 @@ module ForemanAnsible
 
     def architecture
       name = facts[:ansible_architecture] || facts[:facter_architecture]
-      Architecture.where(:name => name).first_or_create unless name.blank?
+      Architecture.where(:name => name).first_or_create if name.present?
     end
 
     def model
       name = detect_fact([:ansible_product_name, :facter_virtual,
                           :facter_productname, :facter_model, :model])
-      Model.where(:name => name.strip).first_or_create unless name.blank?
+      Model.where(:name => name.strip).first_or_create if name.present?
     end
 
     def domain
       name = detect_fact([:ansible_domain, :facter_domain,
                           :ohai_domain, :domain])
-      Domain.where(:name => name).first_or_create unless name.blank?
+      Domain.where(:name => name).first_or_create if name.present?
     end
 
     def support_interfaces_parsing?
@@ -65,12 +65,12 @@ module ForemanAnsible
     private
 
     def ansible_interfaces
-      return [] unless facts[:ansible_interfaces].present?
+      return [] if facts[:ansible_interfaces].blank?
       facts[:ansible_interfaces].sort
     end
 
     def ip_from_interface(interface)
-      return unless facts[:"ansible_#{interface}"]['ipv4'].present?
+      return if facts[:"ansible_#{interface}"]['ipv4'].blank?
       facts[:"ansible_#{interface}"]['ipv4']['address']
     end
 
@@ -79,10 +79,29 @@ module ForemanAnsible
         facts[:ansible_lsb] && facts[:ansible_lsb]['id']
     end
 
+    def debian_os_major_sid
+      case facts[:ansible_distribution_major_version]
+      when /wheezy/i
+        '7'
+      when /jessie/i
+        '8'
+      when /stretch/i
+        '9'
+      when /buster/i
+        '10'
+      end
+    end
+
+    # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity
     def os_major
-      facts[:ansible_distribution_major_version] ||
-        facts[:ansible_lsb] && facts[:ansible_lsb]['major_release'] ||
-        (facts[:version].split('R')[0] if os_name == 'junos')
+      if os_name == 'Debian' &&
+         facts[:ansible_distribution_major_version][%r{\/sid}i]
+        debian_os_major_sid
+      else
+        facts[:ansible_distribution_major_version] ||
+          facts[:ansible_lsb] && facts[:ansible_lsb]['major_release'] ||
+          (facts[:version].split('R')[0] if os_name == 'junos')
+      end
     end
 
     def os_release

data/app/services/foreman_ansible/inventory_creator.rb

@@ -35,28 +35,13 @@ module ForemanAnsible
     end
 
     def connection_params(host)
-      params = {
-        'ansible_port' => host_port(host),
-        'ansible_user' => host_user(host),
-        'ansible_ssh_pass' => host_ssh_pass(host),
-        'ansible_connection' => connection_type(host),
-        'ansible_winrm_server_cert_validation' => winrm_cert_validation(host)
-      }
+      params = ansible_settings.merge ansible_extra_options(host)
       # Backward compatibility for Ansible 1.x
       params['ansible_ssh_port'] = params['ansible_port']
       params['ansible_ssh_user'] = params['ansible_user']
       params
     end
 
-    def winrm_cert_validation(host)
-      host.host_params['ansible_winrm_server_cert_validation'] ||
-        Setting['ansible_winrm_server_cert_validation']
-    end
-
-    def connection_type(host)
-      host.host_params['ansible_connection'] || Setting['ansible_connection']
-    end
-
     def host_roles(host)
       host.all_ansible_roles.map(&:name)
     end
@@ -69,16 +54,20 @@ module ForemanAnsible
       host.host_params
     end
 
-    def host_port(host)
-      host.host_params['ansible_port'] || Setting[:ansible_port]
+    def ansible_settings
+      Hash[
+        %w[port user ssh_pass connection
+           ssh_private_key_file become
+           winrm_server_cert_validation].map do |setting|
+          ["ansible_#{setting}", Setting["ansible_#{setting}"]]
+        end
+      ]
     end
 
-    def host_user(host)
-      host.host_params['ansible_user'] || Setting[:ansible_user]
-    end
-
-    def host_ssh_pass(host)
-      host.host_params['ansible_ssh_pass'] || Setting[:ansible_ssh_pass]
+    def ansible_extra_options(host)
+      host.host_params.select do |key, _|
+        /ansible_/.match(key) || Setting[key]
+      end
     end
 
     private

data/app/services/foreman_ansible/ui_roles_importer.rb

@@ -6,7 +6,7 @@ module ForemanAnsible
     end
 
     def finish_import(changes)
-      return unless changes.present?
+      return if changes.blank?
       create_new_roles changes['new'] if changes['new']
       delete_old_roles changes['obsolete'] if changes['obsolete']
     end

data/app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb

@@ -7,10 +7,9 @@
     {
       :disabled => f.object.inherited_ansible_roles.map(&:id),
       :label => _('Available roles'),
-      :help_inline => popover('' ,
-          _('This list of roles will be applied when the host finishes '\
-            'provisioning. Users can also play these roles through the API '\
-            'or by clicking on the Play Roles button on the Host page '))
+      :label_help => _('This list of roles will be applied when the host finishes<br/> '\
+            'provisioning. Users can also play these roles through the API<br/>'\
+            'or by clicking on the Play Roles button on the Host page ').html_safe
     },
     { 'data-inheriteds' => f.object.inherited_ansible_roles.map(&:id).to_json }) %>
 </div>

data/config/routes.rb

@@ -1,3 +1,4 @@
+# rubocop:disable BlockLength
 Rails.application.routes.draw do
   scope '/ansible' do
     constraints(:id => %r{[^\/]+}) do

data/db/migrate/20161122154057_automatically_set_role_timestamps.rb

@@ -1,11 +1,16 @@
+# Creation and updates timestamps for Ansible Roles
 class AutomaticallySetRoleTimestamps < ActiveRecord::Migration
   def up
-    change_column :ansible_roles, :created_at, :datetime, :null => true, :default => nil
-    change_column :ansible_roles, :updated_at, :datetime, :null => true, :default => nil
+    change_column :ansible_roles, :created_at, :datetime, :null => true,
+                                                          :default => nil
+    change_column :ansible_roles, :updated_at, :datetime, :null => true,
+                                                          :default => nil
   end
 
   def down
-    change_column :ansible_roles, :created_at, :datetime, :null => false, :default => Time.now.utc
-    change_column :ansible_roles, :updated_at, :datetime, :null => false, :default => Time.now.utc
+    change_column :ansible_roles, :created_at, :datetime,
+                  :null => false, :default => Time.now.utc
+    change_column :ansible_roles, :updated_at, :datetime,
+                  :null => false, :default => Time.now.utc
   end
 end

data/lib/foreman_ansible/engine.rb

@@ -5,6 +5,7 @@ require 'foreman_ansible_core'
 
 module ForemanAnsible
   # This engine connects ForemanAnsible with Foreman core
+  # rubocop:disable ClassLength
   class Engine < ::Rails::Engine
     engine_name 'foreman_ansible'
 
@@ -30,9 +31,10 @@ module ForemanAnsible
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
+    # rubocop:disable BlockLength
     initializer 'foreman_ansible.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_ansible do
-        requires_foreman '>= 1.12'
+        requires_foreman '>= 1.15'
 
         security_block :foreman_ansible do
           permission :play_roles_on_host,
@@ -64,6 +66,8 @@ module ForemanAnsible
               :view_ansible_roles, :destroy_ansible_roles,
               :import_ansible_roles]
 
+        add_all_permissions_to_default_roles
+
         role_assignment_params = { :ansible_role_ids => [],
                                    :ansible_roles => [] }
         parameter_filter Host::Managed, role_assignment_params
@@ -96,7 +100,7 @@ module ForemanAnsible
     end
 
     initializer 'foreman_ansible.assets.precompile' do |app|
-      app.config.assets.precompile += %w(foreman_ansible/Ansible.png)
+      app.config.assets.precompile += %w[foreman_ansible/Ansible.png]
     end
 
     initializer 'foreman_ansible.configure_assets', :group => :assets do

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 = '1.4.5'.freeze
+  VERSION = '1.4.6'.freeze
 end

data/test/functional/api/v2/ansible_roles_controller_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 module Api
   module V2
+    # Tests for the controller to CRUD Ansible Roles
     class AnsibleRolesControllerTest < ActionController::TestCase
       setup do
         @role = FactoryGirl.create(:ansible_role)

data/test/functional/api/v2/hostgroups_controller_test.rb

@@ -3,6 +3,7 @@ require 'dynflow/testing'
 
 module Api
   module V2
+    # Tests for the extra methods to play roles on Hostgroup
     class HostgroupsControllerTest < ActionController::TestCase
       include ::Dynflow::Testing
 

data/test/functional/api/v2/hosts_controller_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 module Api
   module V2
+    # Tests for the extra methods to play roles on a Host
     class HostsControllerTest < ActionController::TestCase
       include ::Dynflow::Testing
 

data/test/functional/hosts_controller_test.rb

@@ -9,6 +9,7 @@ class HostsControllerExtensionsTest < ActionController::TestCase
 
   tests ::HostsController
 
+  # rubocop:disable Metrics/BlockLength
   context 'role assignment' do
     setup do
       @role = FactoryGirl.create(:ansible_role)

data/test/support/fixture_support.rb

@@ -1,11 +1,15 @@
 module ForemanAnsible
+  # Allow to add fixtures to plugins
   module PluginFixtures
     FIXTURE_MAPPING = {
       :ansible_permissions => :permissions
     }.freeze
 
     def self.add_fixtures(new_fixture_path)
-      FileUtils.cp(Dir.glob("#{Rails.root}/test/fixtures/*"), new_fixture_path)
+      FileUtils.cp(
+        Dir.glob(Rails.root.join('test', 'fixtures', '*')),
+        new_fixture_path
+      )
       copy_plugin_fixtures new_fixture_path
     end
 

data/test/support/foreman_tasks/task.rb

@@ -1,5 +1,6 @@
 module Support
   module ForemanTasks
+    # Stubbing for foreman tasks
     module Task
       def stub_tasks!
         @controller.stubs(:sync_task).returns(build_task_stub)

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

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+# Playbook Runner - this class uses foreman_tasks_core
+# to run playbooks
 class PlaybookRunnerTest < ActiveSupport::TestCase
   context 'roles dir' do
     test 'reads default when none provided' do

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

@@ -1,5 +1,7 @@
 require 'test_plugin_helper'
 
+# Tests for the Roles Reader service of ansible core,
+# this class simply reads roles from its path in ansible.cfg
 class RolesReaderTest < ActiveSupport::TestCase
   CONFIG_PATH = '/etc/ansible/ansible.cfg'.freeze
   ROLES_PATH = '/etc/ansible/roles'.freeze
@@ -8,50 +10,84 @@ class RolesReaderTest < ActiveSupport::TestCase
     test 'detects commented roles_path' do
       expect_content_config ['#roles_path = thisiscommented!']
       assert_equal(ROLES_PATH,
-                   ForemanAnsibleCore::RolesReader.roles_path(CONFIG_PATH))
+                   ForemanAnsibleCore::RolesReader.roles_path)
     end
 
     test 'returns default path if no roles_path defined' do
       expect_content_config ['norolepath!']
       assert_equal(ROLES_PATH,
-                   ForemanAnsibleCore::RolesReader.roles_path(CONFIG_PATH))
+                   ForemanAnsibleCore::RolesReader.roles_path)
     end
 
     test 'returns roles_path if one is defined' do
       expect_content_config ['roles_path = /mycustom/ansibleroles/path']
       assert_equal('/mycustom/ansibleroles/path',
-                   ForemanAnsibleCore::RolesReader.roles_path(CONFIG_PATH))
+                   ForemanAnsibleCore::RolesReader.roles_path)
     end
   end
 
   describe '#list_roles' do
-    setup do
-      # Return a path without actually reading the config file to make tests
-      # pass even on hosts without Ansible installed
-      ForemanAnsibleCore::RolesReader.stubs(:roles_path).
-        returns('/etc/ansible/roles')
+    test 'reads roles from paths' do
+      expect_content_config ["roles_path = #{ROLES_PATH}"]
+      ForemanAnsibleCore::RolesReader.expects(:read_roles)
+                                     .with(ROLES_PATH)
+      ForemanAnsibleCore::RolesReader.list_roles
     end
 
-    test 'handles "No such file or dir" with exception' do
-      Dir.expects(:glob).with("#{ROLES_PATH}/*").raises(Errno::ENOENT)
-      ex = assert_raises(ForemanAnsibleCore::ReadConfigFileException) do
-        ForemanAnsibleCore::RolesReader.list_roles
+    test 'reads roles from paths' do
+      roles_paths = ['/mycustom/roles/path', '/another/path']
+      roles_paths.each do |path|
+        ForemanAnsibleCore::RolesReader.expects(:read_roles)
+                                       .with(path)
       end
-      assert_match(/Could not read Ansible config file/, ex.message)
+      expect_content_config ["roles_path = #{roles_paths.join(':')}"]
+      ForemanAnsibleCore::RolesReader.list_roles
     end
 
-    test 'raises error if the roles path is not readable' do
-      Dir.expects(:glob).with("#{ROLES_PATH}/*").raises(Errno::EACCES)
-      ex = assert_raises(ForemanAnsibleCore::ReadConfigFileException) do
-        ForemanAnsibleCore::RolesReader.list_roles
+    context 'with unreadable roles path' do
+      setup do
+        expect_content_config ["roles_path = #{ROLES_PATH}"]
+      end
+
+      test 'handles "No such file or dir" with exception' do
+        Dir.expects(:glob).with("#{ROLES_PATH}/*").raises(Errno::ENOENT)
+        ex = assert_raises(ForemanAnsibleCore::ReadRolesException) do
+          ForemanAnsibleCore::RolesReader.list_roles
+        end
+        assert_match(/Could not read Ansible roles/, ex.message)
+      end
+
+      test 'raises error if the roles path is not readable' do
+        Dir.expects(:glob).with("#{ROLES_PATH}/*").raises(Errno::EACCES)
+        ex = assert_raises(ForemanAnsibleCore::ReadRolesException) do
+          ForemanAnsibleCore::RolesReader.list_roles
+        end
+        assert_match(/Could not read Ansible roles/, ex.message)
+      end
+    end
+
+    context 'with unreadable config' do
+      test 'handles "No such file or dir" with exception' do
+        File.expects(:readlines).with(CONFIG_PATH).raises(Errno::ENOENT)
+        ex = assert_raises(ForemanAnsibleCore::ReadConfigFileException) do
+          ForemanAnsibleCore::RolesReader.list_roles
+        end
+        assert_match(/Could not read Ansible config file/, ex.message)
+      end
+
+      test 'raises error if the roles path is not readable' do
+        File.expects(:readlines).with(CONFIG_PATH).raises(Errno::EACCES)
+        ex = assert_raises(ForemanAnsibleCore::ReadConfigFileException) do
+          ForemanAnsibleCore::RolesReader.list_roles
+        end
+        assert_match(/Could not read Ansible config file/, ex.message)
       end
-      assert_match(/Could not read Ansible config file/, ex.message)
     end
   end
 
   private
 
   def expect_content_config(ansible_cfg_content)
-    File.expects(:readlines).with(CONFIG_PATH).returns(ansible_cfg_content)
+    ForemanAnsibleCore::RolesReader.expects(:roles_path_from_config).returns(ansible_cfg_content)
   end
 end

data/test/unit/services/fact_parser_test.rb

@@ -50,4 +50,27 @@ module ForemanAnsible
       sample_mock.expects(:first_or_create)
     end
   end
+
+  # Tests for Debian parser
+  class DebianFactParserTest < ActiveSupport::TestCase
+    setup do
+      @facts_parser = ForemanAnsible::FactParser.new(
+        HashWithIndifferentAccess.new(
+          '_type' => 'ansible',
+          '_timestamp' => '2015-10-29 20:01:51 +0100',
+          'ansible_facts' =>
+          {
+            'ansible_distribution_major_version' => 'buster/sid',
+            'ansible_distribution' => 'Debian'
+          }
+        )
+      )
+    end
+
+    test 'Parses debian unstable aka sid correctly' do
+      os = @facts_parser.operatingsystem
+      assert_equal '10', os.major
+      assert_equal 'Debian', os.name
+    end
+  end
 end

data/test/unit/services/inventory_creator_test.rb

@@ -0,0 +1,49 @@
+require 'test_plugin_helper'
+
+module ForemanAnsible
+  # Test how the inventory creator service transforms host params into
+  # inventory variables and connection options
+  class InventoryCreatorTest < ActiveSupport::TestCase
+    setup do
+      @host = FactoryGirl.build(:host)
+    end
+
+    test 'ansible_ parameters get turned into host variables' do
+      extra_options = {
+        'ansible_integer_option' => 1,
+        'ansible_string_option' => '1',
+        'ansible_boolean_option' => true,
+        'ansible_user' => 'someone'
+      }
+      @host.expects(:host_params).returns(extra_options).at_least_once
+      inventory = ForemanAnsible::InventoryCreator.new(@host)
+
+      assert_empty extra_options.to_a - inventory.connection_params(@host).to_a
+    end
+
+    test 'settings are respected if param cannot be found' do
+      extra_options = { 'ansible_user' => 'someone', 'ansible_port' => 2000 }
+      Setting.expects(:[]).with('ansible_become').returns(nil).at_least_once
+      Setting.expects(:[]).with('ansible_ssh_private_key_file').
+        returns(nil).at_least_once
+      Setting.expects(:[]).with('ansible_port').returns(nil).at_least_once
+      Setting.expects(:[]).with('ansible_user').returns(nil).at_least_once
+      Setting.expects(:[]).with('ansible_ssh_pass').
+        returns('asafepassword').at_least_once
+      Setting.expects(:[]).with('ansible_winrm_server_cert_validation').
+        returns(true).at_least_once
+      Setting.expects(:[]).with('ansible_connection').
+        returns('ssh').at_least_once
+      @host.expects(:host_params).returns(extra_options).at_least_once
+      inventory = ForemanAnsible::InventoryCreator.new(@host)
+      connection_params = inventory.connection_params(@host)
+      assert_empty extra_options.to_a - inventory.connection_params(@host).to_a
+      assert_equal Setting['ansible_connection'],
+                   connection_params['ansible_connection']
+      assert_equal Setting['ansible_ssh_pass'],
+                   connection_params['ansible_ssh_pass']
+      assert_equal Setting['ansible_winrm_server_cert_validation'],
+                   connection_params['ansible_winrm_server_cert_validation']
+    end
+  end
+end

data/test/unit/services/proxy_selector_test.rb

@@ -1,5 +1,6 @@
 require 'test_plugin_helper'
 
+# Tests for the Proxy Selector service
 class ProxySelectorTest < ActiveSupport::TestCase
   setup do
     @host = FactoryGirl.create(:host)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -187,6 +187,7 @@ files:
 - test/unit/services/fact_importer_test.rb
 - test/unit/services/fact_parser_test.rb
 - test/unit/services/fact_sparser_test.rb
+- test/unit/services/inventory_creator_test.rb
 - test/unit/services/proxy_selector_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
@@ -211,38 +212,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_roles.rb
-- test/fixtures/ansible_permissions.yml
-- test/fixtures/sample_facts.json
-- 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/hosts_controller_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/support/fixture_support.rb
-- test/support/foreman_tasks/task.rb
-- test/support/foreman_test_helper_additions.rb
 - test/unit/ansible_role_test.rb
-- test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
-- test/unit/helpers/foreman_ansible/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/playbook_runner_test.rb
-- test/unit/lib/foreman_ansible_core/roles_reader_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/api_roles_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_parser_test.rb
 - test/unit/services/fact_sparser_test.rb
-- test/unit/services/roles_importer_test.rb
+- test/unit/services/proxy_selector_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/proxy_selector_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/foreman_ansible/ansible_reports_helper_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/hostgroup_extensions_test.rb
+- test/factories/ansible_proxy.rb
+- test/factories/ansible_roles.rb
 - test/test_plugin_helper.rb
+- test/fixtures/ansible_permissions.yml
+- test/fixtures/sample_facts.json
+- test/support/fixture_support.rb
+- test/support/foreman_test_helper_additions.rb
+- test/support/foreman_tasks/task.rb
+- test/functional/ansible_roles_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