foreman_ansible 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b51e2ee078f80efdc740694e7b27dd61bc6143420f7452db7d44dd085b6a30
-  data.tar.gz: f45a78080c31ffe8e5ad6595fb45ed5f81d151b68a113c1059615471c62cc245
+  metadata.gz: 04ef2672d90809de50a458709449a10b393e8b4cf2eae9c1d905682822ecac82
+  data.tar.gz: 1aadd4214a4d53962dfffc9014ae05168c8125ea7a3addc34235d29333c7c30e
 SHA512:
-  metadata.gz: 238e18d65857e84570cb3c7fe9429c945d5c6eb05bcc9cd2dd814181ab47a0d2e271edc056c3a0a0497c424b990af57ad8113ddbda1779eddadffd0c142b2794
-  data.tar.gz: 38e1705a05da9f3d6885ec03bb7dcc0353eaac253896b0d5466aea839973d1ae25a51e3a1aee6eb98c7b9079d0494bf5e2991e1d6ac150c443460e1646dc844a
+  metadata.gz: ae214b5e3516d85af5cb3ade922061ced9e797b39e078cfe63db3b87cc11faf817186aff3230704f2d7d501e5b0d08ccd2e042289a2ef8ae22a430ac6e09f369
+  data.tar.gz: 3a91c4fdb49e342f20a709aaa5e9083e77af70bca95738e8aa0e2bb53441cde66e2f662351a65f2b2195b3cc365ef9793616281ecb35c17f63f0d904c541ee05

data/README.md

@@ -7,7 +7,7 @@
 Reporting and facts import from Ansible to Foreman.
 
 * Main website: [theforeman.org](http://theforeman.org)
-* Plugin manual: [foreman_ansible manual](http://theforeman.org/plugins/foreman_ansible/1.x/index.html)
+* Plugin manual: [foreman_ansible manual](http://theforeman.org/plugins/foreman_ansible)
 * ServerFault tag: [Foreman](http://serverfault.com/questions/tagged/foreman)
 * Issues: [foreman ansible on Redmine](http://projects.theforeman.org/projects/ansible/issues)
 * Community and support: [#theforeman](https://kiwiirc.com/client/irc.freenode.net/?#theforeman) for general support, [#theforeman-dev](https://kiwiirc.com/client/irc.freenode.net/?#theforeman-dev) for development chat in [Freenode](irc.freenode.net)

data/app/controllers/api/v2/ansible_roles_controller.rb

@@ -29,24 +29,27 @@ module Api
         process_response @ansible_role.destroy
       end
 
-      api :POST, '/ansible_roles/import', N_('Import Ansible roles')
-      param :proxy, Hash, N_('Smart Proxy to import from')
+      api :PUT, '/ansible_roles/import', N_('Import Ansible roles')
+      param :proxy_id, :identifier, N_('Smart Proxy to import from')
       def import
         @imported = @importer.import!
       end
 
-      api :POST, '/ansible_roles/obsolete', N_('Obsolete Ansible roles')
-      param :proxy, Hash, N_('Smart Proxy to import from')
+      api :PUT, '/ansible_roles/obsolete', N_('Obsolete Ansible roles')
+      param :proxy_id, :identifier, N_('Smart Proxy to import from')
       def obsolete
         @obsoleted = @importer.obsolete!
       end
 
       private
 
+      # rubocop:disable DotPosition
       def find_proxy
-        return nil unless params[:proxy]
-        @proxy = SmartProxy.authorized(:view_smart_proxies).find(params[:proxy])
+        return nil unless params[:proxy_id]
+        @proxy = SmartProxy.authorized(:view_smart_proxies)
+                           .find(params[:proxy_id])
       end
+      # rubocop:enable DotPosition
 
       def create_importer
         @importer = ForemanAnsible::ApiRolesImporter.new(@proxy)

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

@@ -0,0 +1,17 @@
+module ForemanAnsible
+  module Api
+    module V2
+      # Extends the hostgroups api controller to support creating with roles
+      module HostgroupsParamGroupExtensions
+        extend Apipie::DSL::Concern
+
+        update_api(:create, :update) do
+          param :hostgroup, Hash do
+            param :ansible_role_ids, Array,
+                  :desc => N_('IDs of associated ansible roles')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module ForemanAnsible
+  module Api
+    module V2
+      # Extends the hosts api controller to support creating/updating with roles
+      module HostsParamGroupExtensions
+        extend Apipie::DSL::Concern
+
+        update_api(:create, :update) do
+          param :host, Hash do
+            param :ansible_role_ids, Array,
+                  :desc => N_('IDs of associated ansible roles')
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/foreman_ansible/host_managed_extensions.rb

@@ -2,7 +2,9 @@ module ForemanAnsible
   # Relations to make Host::Managed 'have' ansible roles
   module HostManagedExtensions
     extend ActiveSupport::Concern
+    include ::ForemanAnsible::Concerns::JobInvocationHelper
 
+    # rubocop:disable Metrics/BlockLength
     included do
       has_many :host_ansible_roles, :foreign_key => :host_id
       has_many :ansible_roles, :through => :host_ansible_roles,
@@ -20,18 +22,28 @@ module ForemanAnsible
         hostgroup.all_ansible_roles
       end
 
+      # This one should be fixed, disabled for the moment as we're
+      # in a rush to get the release out
+      # rubocop:disable Metrics/AbcSize
       def play_ansible_roles
-        return unless ansible_roles.present? || inherited_ansible_roles.present?
-        task = ::ForemanTasks.async_task(
-          ::Actions::ForemanAnsible::PlayHostRoles,
-          self,
-          ::ForemanAnsible::ProxySelector.new,
-          :timeout => Setting['ansible_post_provision_timeout']
+        return true unless ansible_roles.present? ||
+                           inherited_ansible_roles.present?
+        composer = job_composer(:ansible_run_host, self)
+        composer.triggering.mode = :future
+        composer.triggering.start_at = (
+          Time.zone.now +
+          Setting::Ansible[:ansible_post_provision_timeout].to_i.seconds
         )
+        composer.trigger!
         logger.info("Task for Ansible roles on #{self} before_provision: "\
-                    "#{Rails.application.routes.url_helpers.task_path(task)}.")
+                    "#{job_invocation_path(composer.job_invocation)}")
+      rescue Foreman::Exception => e
+        logger.info("Error running Ansible roles on #{self} before_provision: "\
+                    "#{e.message}")
       end
+      # rubocop:enable Metrics/AbcSize
     end
+    # rubocop:enable Metrics/BlockLength
   end
 end
 

data/app/models/setting/ansible.rb

@@ -43,11 +43,11 @@ class Setting
               'ansible_verbosity',
               N_('Foreman will add the this level of verbosity for '\
                  'additional debugging output when running Ansible playbooks.'),
-              '',
+              '0',
               N_('Default verbosity level'),
               nil,
               :collection => lambda do
-                { '' => N_('Disabled'),
+                { '0' => N_('Disabled'),
                   '1' => N_('Level 1 (-v)'),
                   '2' => N_('Level 2 (-vv)'),
                   '3' => N_('Level 3 (-vvv)'),

data/app/services/foreman_ansible/fact_parser.rb

@@ -2,18 +2,13 @@ module ForemanAnsible
   # Override methods from Foreman app/services/fact_parser so that facts
   # representing host properties are understood when they come from Ansible.
   class FactParser < ::FactParser
+    include OperatingSystemParser
     attr_reader :facts
 
     def initialize(facts)
       @facts = HashWithIndifferentAccess.new(facts[:ansible_facts])
     end
 
-    def operatingsystem
-      args = { :name => os_name, :major => os_major, :minor => os_minor }
-      Operatingsystem.where(args).first ||
-        Operatingsystem.create!(args.merge(:description => os_description))
-    end
-
     # Don't do anything as there's no env in Ansible
     def environment; end
 
@@ -75,52 +70,6 @@ module ForemanAnsible
       facts[:"ansible_#{interface}"]['ipv4']['address']
     end
 
-    def os_name
-      facts[:ansible_distribution] ||
-        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
-      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
-    # rubocop:enable AbcSize, CyclomaticComplexity, PerceivedComplexity
-
-    def os_release
-      facts[:ansible_distribution_version] ||
-        facts[:ansible_lsb] && facts[:ansible_lsb]['release']
-    end
-
-    def os_minor
-      _, minor = (os_release.split('.') unless os_release.nil?) ||
-                 (facts[:version].split('R') if os_name == 'junos')
-      minor || ''
-    end
-
-    def os_description
-      facts[:ansible_lsb] && facts[:ansible_lsb]['description']
-    end
-
     # Returns first non-empty fact. Needed to check for empty strings.
     def detect_fact(fact_names)
       facts[

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -0,0 +1,92 @@
+module ForemanAnsible
+  # Methods to parse facts related to the OS
+  module OperatingSystemParser
+    def operatingsystem
+      args = { :name => os_name, :major => os_major, :minor => os_minor }
+      return @local_os if local_os(args).present?
+      return @new_os if new_os(args).present?
+      logger.debug do
+        'Ansible facts parser: No OS could be created with '\
+        "os_name='#{os_name}' os_major='#{os_major}' "\
+        "os_minor='#{os_minor}': "\
+        "#{@new_os.errors if @new_os.present?}"
+      end
+      nil
+    end
+
+    def local_os(args)
+      @local_os = Operatingsystem.where(args).first
+    end
+
+    def new_os(args)
+      return @new_os if @new_os.present?
+      @new_os = Operatingsystem.new(args.merge(:description => os_description))
+      @new_os if @new_os.valid? && @new_os.save
+    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
+      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
+    # rubocop:enable AbcSize, CyclomaticComplexity, PerceivedComplexity
+
+    def os_release
+      facts[:ansible_distribution_version] ||
+        facts[:ansible_lsb] && facts[:ansible_lsb]['release']
+    end
+
+    # rubocop:disable AbcSize
+    def os_minor
+      _, minor = (os_release.split('.', 2) unless os_release.nil?) ||
+                 (facts[:version].split('R') if os_name == 'junos')
+      # Until Foreman supports os.minor as something that's not a number,
+      # we should remove the extra dots in the version. E.g:
+      # '6.1.7601.65536' becomes '6.1.760165536'
+      if facts[:ansible_os_family] == 'Windows'
+        minor, patch = minor.split('.', 2)
+        patch.tr!('.', '')
+        minor = "#{minor}.#{patch}"
+      end
+      minor || ''
+    end
+
+    def os_name
+      if facts[:ansible_os_family] == 'Windows'
+        facts[:ansible_os_name].tr(" \n\t", '') ||
+          facts[:ansible_distribution].tr(" \n\t", '')
+      else
+        facts[:ansible_distribution] ||
+          facts[:ansible_lsb] && facts[:ansible_lsb]['id']
+      end
+    end
+    # rubocop:enable AbcSize
+
+    def os_description
+      if facts[:ansible_os_family] == 'Windows'
+        facts[:ansible_os_name].strip || facts[:ansible_distribution].strip
+      else
+        facts[:ansible_lsb] && facts[:ansible_lsb]['description']
+      end
+    end
+  end
+end

data/db/migrate/20180410125416_rename_ansible_job_categories.rb

@@ -14,7 +14,7 @@ class RenameAnsibleJobCategories < ActiveRecord::Migration[5.1]
         job_templates.each do |job_template|
           next if job_template.job_category =~ /^Ansible/
           job_template.job_category = "Ansible #{job_template.job_category}"
-          job_template.save_without_auditing
+          job_template.save
         end
   
         service_template = JobTemplate.where(

data/db/seeds.d/75_job_templates.rb

@@ -1,3 +1,5 @@
+organizations = Organization.unscoped.all
+locations = Location.unscoped.all
 User.as_anonymous_admin do
   RemoteExecutionFeature.without_auditing do
     if Rails.env.test? || File.basename($PROGRAM_NAME) == 'rake'
@@ -12,10 +14,12 @@ User.as_anonymous_admin do
       Dir[File.join("#{ForemanAnsible::Engine.root}/app/views/foreman_ansible/"\
                     'job_templates/**/*.erb')].each do |template|
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-        JobTemplate.import_raw!(File.read(template),
-                                :default => true,
-                                :locked => true,
-                                :update => sync)
+        template = JobTemplate.import_raw!(File.read(template),
+                                           :default => true,
+                                           :locked => true,
+                                           :update => sync)
+        template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
+        template.locations = locations if SETTINGS[:locations_enabled] && template.present?
       end
     end
   end

data/lib/foreman_ansible/engine.rb

@@ -92,12 +92,18 @@ module ForemanAnsible
         ::Api::V2::HostsController.send(
           :include, ForemanAnsible::Api::V2::HostsControllerExtensions
         )
+        ::Api::V2::HostsController.send(
+          :include, ForemanAnsible::Api::V2::HostsParamGroupExtensions
+        )
         ::HostgroupsController.send(
           :include, ForemanAnsible::Concerns::HostgroupsControllerExtensions
         )
         ::Api::V2::HostgroupsController.send(
           :include, ForemanAnsible::Api::V2::HostgroupsControllerExtensions
         )
+        ::Api::V2::HostgroupsController.send(
+          :include, ForemanAnsible::Api::V2::HostgroupsParamGroupExtensions
+        )
       rescue StandardError => e
         Rails.logger.warn "Foreman Ansible: skipping engine hook (#{e})"
       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.1.2'.freeze
+  VERSION = '2.2.0'.freeze
 end

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

@@ -22,6 +22,18 @@ module Api
         assert_response :ok
         refute AnsibleRole.exists?(@role.id)
       end
+
+      test 'should import' do
+        put :import,
+            :session => set_session_user
+        assert_response :success
+      end
+
+      test 'should obsolete' do
+        put :obsolete,
+            :session => set_session_user
+        assert_response :success
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Api
     # Tests for the extra methods to play roles on a Host
     class HostsControllerTest < ActionController::TestCase
       setup do
+        @ansible_role1 = FactoryBot.create(:ansible_role)
+        @ansible_role2 = FactoryBot.create(:ansible_role)
         @host1 = FactoryBot.create(:host)
         @host2 = FactoryBot.create(:host)
       end
@@ -36,6 +38,30 @@ module Api
         response = JSON.parse(@response.body)
         assert_job_invocation_is_ok(response, targets)
       end
+
+      test 'should create a host with ansible_role_ids param' do
+        post :create,
+             :params => { :host => { :ansible_role_ids => @ansible_role1.id,
+                                     :managed => false,
+                                     :name => 'Doe' } },
+             :session => set_session_user
+        assert_response :created
+        assert assigns('host').ansible_roles, [@ansible_role1]
+      end
+
+      test 'should update a host with ansible_role_ids param' do
+        host = FactoryBot.create(:host,
+                                 :managed => false,
+                                 :ansible_role_ids => [@ansible_role1.id])
+        post :update,
+             :params => {
+               :id => host.id,
+               :host => { :ansible_role_ids => [@ansible_role2.id] }
+             },
+             :session => set_session_user
+        assert_response :success
+        assert assigns('host').ansible_roles, [@ansible_role2]
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@ require 'test_helper'
 class PlaybookRunnerTest < ActiveSupport::TestCase
   context 'roles dir' do
     test 'reads default when none provided' do
+      ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:unknown_hosts).
+        returns([])
       File.expects(:exist?).with('/etc/ansible').returns(true)
       runner = ForemanAnsibleCore::PlaybookRunner.new(nil, nil)
       assert '/etc/ansible', runner.instance_variable_get('@ansible_dir')
@@ -12,6 +14,11 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
   end
 
   context 'working_dir' do
+    setup do
+      ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:unknown_hosts).
+        returns([])
+    end
+
     test 'creates temp one if not provided' do
       Dir.expects(:mktmpdir)
       File.expects(:exist?).with('/etc/ansible').returns(true)
@@ -27,4 +34,42 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
       assert '/foo', runner.instance_variable_get('@working_dir')
     end
   end
+
+  context 'TOFU policy' do # Trust On First Use
+    setup do
+      @inventory = { 'all' => { 'hosts' => ['foreman.example.com'] } }.to_json
+      @output = StringIO.new
+      logger = Logger.new(@output)
+      ForemanAnsibleCore::PlaybookRunner.any_instance.stubs(:logger).
+        returns(logger)
+    end
+
+    test 'ignores known hosts' do
+      Net::SSH::KnownHosts.expects(:search_for).
+        with('foreman.example.com').returns(['somekey'])
+      ForemanAnsibleCore::PlaybookRunner.any_instance.
+        expects(:add_to_known_hosts).never
+      ForemanAnsibleCore::PlaybookRunner.new(@inventory, nil)
+    end
+
+    test 'adds unknown hosts to known_hosts' do
+      Net::SSH::KnownHosts.expects(:search_for).
+        with('foreman.example.com').returns([])
+      ForemanAnsibleCore::PlaybookRunner.any_instance.
+        expects(:add_to_known_hosts).with('foreman.example.com')
+      ForemanAnsibleCore::PlaybookRunner.new(@inventory, nil)
+    end
+
+    test 'logs error when it cannot add to known_hosts' do
+      Net::SSH::KnownHosts.expects(:search_for).
+        with('foreman.example.com').returns([])
+      Net::SSH::Transport::Session.expects(:new).with('foreman.example.com').
+        raises(Net::Error)
+      ForemanAnsibleCore::PlaybookRunner.new(@inventory, nil)
+      assert_match(
+        /ERROR.*Failed to save host key for foreman.example.com: Net::Error/,
+        @output.string
+      )
+    end
+  end
 end

data/test/unit/services/fact_parser_test.rb

@@ -38,6 +38,15 @@ module ForemanAnsible
       @facts_parser.operatingsystem
     end
 
+    test 'does not fail if facts are not enough to create OS' do
+      @facts_parser.expects(:os_name).returns('fakeos').at_least_once
+      @facts_parser.expects(:os_major).returns('').at_least_once
+      @facts_parser.expects(:os_minor).returns('').at_least_once
+      @facts_parser.expects(:os_description).returns('').at_least_once
+      Operatingsystem.any_instance.expects(:valid?).returns(false)
+      assert_nil @facts_parser.operatingsystem
+    end
+
     private
 
     def expect_where(model, fact_name)
@@ -71,4 +80,76 @@ module ForemanAnsible
       assert_equal 'Debian', os.name
     end
   end
+
+  # Tests for Windows parser
+  class WindowsFactParserTest < ActiveSupport::TestCase
+    context 'Windows 7' do
+      setup do
+        @facts_parser = ForemanAnsible::FactParser.new(
+          HashWithIndifferentAccess.new(
+            '_type' => 'ansible',
+            '_timestamp' => '2015-10-29 20:01:51 +0100',
+            'ansible_facts' => {
+              'ansible_architecture' => '32-Bit',
+              'ansible_distribution' => 'Microsoft Windows 7 Enterprise ',
+              'ansible_distribution_major_version' => '6',
+              'ansible_distribution_version' => '6.1.7601.65536',
+              'ansible_os_family' => 'Windows',
+              'ansible_os_name' => 'Microsoft Windows 7 Enterprise',
+              'ansible_product_name' => 'DS61',
+              'ansible_product_serial' => 'To be filled by O.E.M.',
+              'ansible_system' => 'Win32NT',
+              'ansible_win_rm_certificate_expires' => '2021-01-23 15:08:48',
+              'ansible_windows_domain' => 'example.com'
+            }
+          )
+        )
+      end
+
+      test 'parses Windows 7 Enterprise correctly' do
+        os = @facts_parser.operatingsystem
+        assert_equal '6', os.major
+        assert_equal '6.1.760165536', os.release
+        assert_equal '1.760165536', os.minor
+        assert_equal 'Windows', os.family
+        assert_equal 'Microsoft Windows 7 Enterprise', os.description
+        assert_equal 'MicrosoftWindows7Enterprise', os.name
+        assert os.valid?
+      end
+    end
+
+    context 'Windows Server 2016' do
+      setup do
+        @facts_parser = ForemanAnsible::FactParser.new(
+          HashWithIndifferentAccess.new(
+            '_type' => 'ansible',
+            '_timestamp' => '2015-10-29 20:01:51 +0100',
+            'ansible_facts' => {
+              'ansible_architecture' => '64-Bit',
+              'ansible_distribution' => 'Microsoft Windows Server 2016 '\
+                                        'Standard',
+              'ansible_distribution_major_version' => '10',
+              'ansible_distribution_version' => '10.0.14393.0',
+              'ansible_os_family' => 'Windows',
+              'ansible_os_name' => 'Microsoft Windows Server 2016 Standard',
+              'ansible_system' => 'Win32NT',
+              'ansible_win_rm_certificate_expires' => '2021-01-23 15:08:48',
+              'ansible_windows_domain' => 'example.com'
+            }
+          )
+        )
+      end
+
+      test 'parses Windows Server correctly' do
+        os = @facts_parser.operatingsystem
+        assert_equal '10', os.major
+        assert_equal '10.0.143930', os.release
+        assert_equal '0.143930', os.minor
+        assert_equal 'Windows', os.family
+        assert_equal 'Microsoft Windows Server 2016 Standard', os.description
+        assert_equal 'MicrosoftWindowsServer2016Standard', os.name
+        assert os.valid?
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -101,7 +101,9 @@ files:
 - app/controllers/ansible_roles_controller.rb
 - app/controllers/api/v2/ansible_roles_controller.rb
 - app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb
+- app/controllers/foreman_ansible/api/v2/hostgroups_param_group_extensions.rb
 - app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb
+- app/controllers/foreman_ansible/api/v2/hosts_param_group_extensions.rb
 - app/controllers/foreman_ansible/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_ansible/concerns/hosts_controller_extensions.rb
 - app/controllers/foreman_ansible/concerns/job_invocation_helper.rb
@@ -133,8 +135,8 @@ files:
 - app/services/foreman_ansible/insights_notification_builder.rb
 - app/services/foreman_ansible/insights_plan_runner.rb
 - app/services/foreman_ansible/inventory_creator.rb
+- app/services/foreman_ansible/operating_system_parser.rb
 - app/services/foreman_ansible/playbook_creator.rb
-- app/services/foreman_ansible/proxy_selector.rb
 - app/services/foreman_ansible/renderer_methods.rb
 - app/services/foreman_ansible/roles_importer.rb
 - app/services/foreman_ansible/structured_fact_importer.rb
@@ -215,7 +217,6 @@ files:
 - test/unit/services/fact_sparser_test.rb
 - test/unit/services/insights_plan_runner_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
 - test/unit/services/ui_roles_importer_test.rb
@@ -250,7 +251,6 @@ test_files:
 - 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/proxy_selector_test.rb
 - test/unit/services/insights_plan_runner_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb

data/app/services/foreman_ansible/proxy_selector.rb

@@ -1,33 +0,0 @@
-module ForemanAnsible
-  # Contains proxy selection rules for a host playbook run
-  class ProxySelector < ::ForemanTasks::ProxySelector
-    def available_proxies(host)
-      proxies = {}
-      if host.execution_interface && host.execution_interface.subnet
-        proxies[:subnet] = host.
-                           execution_interface.
-                           subnet.
-                           remote_execution_proxies.with_features(provider)
-      end
-      proxies[:fallback] = host.smart_proxies.with_features('Ansible')
-      proxies[:global] = proxy_scope(host).authorized.with_features('Ansible')
-      proxies
-    end
-
-    def determine_proxy(*args)
-      result = super
-      return result unless result == :not_available
-      # Always run roles in some way, even if there are no proxies, Foreman
-      # should take that role in that case.
-      :not_defined
-    end
-
-    private
-
-    def proxy_scope(host)
-      return ::SmartProxy unless Taxonomy.enabled_taxonomies.any?
-      ::SmartProxy.with_taxonomy_scope_override(host.location,
-                                                host.organization)
-    end
-  end
-end

data/test/unit/services/proxy_selector_test.rb

@@ -1,29 +0,0 @@
-require 'test_plugin_helper'
-
-# Tests for the Proxy Selector service
-class ProxySelectorTest < ActiveSupport::TestCase
-  setup do
-    @host = FactoryBot.create(:host)
-  end
-
-  test 'reuses proxies already assigned to host' do
-    mocked_scope = mock
-    mocked_scope.expects(:with_features).with('Ansible').returns('foo')
-    @host.expects(:smart_proxies).returns(mocked_scope)
-    proxy_selector = ForemanAnsible::ProxySelector.new
-    assert_equal 'foo',
-                 proxy_selector.available_proxies(@host)[:fallback]
-  end
-
-  test 'only finds proxies that are within host taxonomies' do
-    @host.organization = taxonomies(:organization1)
-    @ansible_proxy = FactoryBot.create(:smart_proxy, :with_ansible,
-                                       :organizations => [@host.organization])
-    # Unreachable proxy, because of the organizations mismatch with Host
-    FactoryBot.create(:smart_proxy, :with_ansible, :organizations => [])
-    proxy_selector = ForemanAnsible::ProxySelector.new
-    setup_user('view', 'smart_proxies')
-    assert_equal [@ansible_proxy],
-                 proxy_selector.available_proxies(@host)[:global]
-  end
-end