foreman_ansible 6.4.1 → 7.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -53,25 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
-  name: ipaddress
+  name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 5.2.0
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -82,7 +76,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/foreman_ansible/Ansible.png
 - app/assets/stylesheets/foreman_ansible/foreman-ansible.css
 - app/controllers/ansible_roles_controller.rb
 - app/controllers/ansible_variables_controller.rb
@@ -102,6 +95,17 @@ files:
 - app/controllers/foreman_ansible/concerns/import_controller_helper.rb
 - app/controllers/foreman_ansible/concerns/job_invocation_helper.rb
 - app/controllers/ui_ansible_roles_controller.rb
+- app/graphql/mutations/ansible_variable_overrides/create.rb
+- app/graphql/mutations/ansible_variable_overrides/delete.rb
+- app/graphql/mutations/ansible_variable_overrides/update.rb
+- app/graphql/mutations/hosts/assign_ansible_roles.rb
+- app/graphql/presenters/ansible_role_presenter.rb
+- app/graphql/presenters/overriden_ansible_variable_presenter.rb
+- app/graphql/types/ansible_role.rb
+- app/graphql/types/ansible_variable.rb
+- app/graphql/types/ansible_variable_override.rb
+- app/graphql/types/inherited_ansible_role.rb
+- app/graphql/types/overriden_ansible_variable.rb
 - app/helpers/foreman_ansible/ansible_plugin_helper.rb
 - app/helpers/foreman_ansible/ansible_reports_helper.rb
 - app/helpers/foreman_ansible/ansible_roles_data_preparations.rb
@@ -115,10 +119,8 @@ files:
 - app/models/concerns/foreman_ansible/host_managed_extensions.rb
 - app/models/concerns/foreman_ansible/hostgroup_extensions.rb
 - app/models/foreman_ansible/ansible_provider.rb
-- app/models/foreman_ansible/fact_name.rb
 - app/models/host_ansible_role.rb
 - app/models/hostgroup_ansible_role.rb
-- app/models/setting/ansible.rb
 - app/overrides/ansible_roles_tab.rb
 - app/overrides/hostgroup_ansible_roles_tab.rb
 - app/overrides/hostgroup_play_roles.rb
@@ -127,20 +129,16 @@ files:
 - app/services/foreman_ansible/ansible_report_importer.rb
 - app/services/foreman_ansible/ansible_report_scanner.rb
 - app/services/foreman_ansible/api_roles_importer.rb
-- app/services/foreman_ansible/fact_importer.rb
-- app/services/foreman_ansible/fact_parser.rb
-- app/services/foreman_ansible/fact_sparser.rb
 - app/services/foreman_ansible/import_roles_and_variables_error_notification.rb
 - app/services/foreman_ansible/import_roles_and_variables_success_notification.rb
 - 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/override_resolver.rb
 - app/services/foreman_ansible/playbook_creator.rb
 - app/services/foreman_ansible/proxy_api.rb
 - app/services/foreman_ansible/renderer_methods.rb
 - app/services/foreman_ansible/roles_importer.rb
-- app/services/foreman_ansible/structured_fact_importer.rb
 - app/services/foreman_ansible/ui_roles_importer.rb
 - app/services/foreman_ansible/variables_importer.rb
 - app/views/ansible_roles/import.html.erb
@@ -150,6 +148,7 @@ files:
 - app/views/ansible_variables/edit.html.erb
 - app/views/ansible_variables/index.html.erb
 - app/views/ansible_variables/new.html.erb
+- app/views/api/v2/ansible_override_values/index.json.rabl
 - app/views/api/v2/ansible_override_values/show.json.rabl
 - app/views/api/v2/ansible_roles/import.json.rabl
 - app/views/api/v2/ansible_roles/index.json.rabl
@@ -186,6 +185,7 @@ files:
 - app/views/foreman_ansible/job_templates/power_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/puppet_run_once_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/run_command_-_ansible_default.erb
+- app/views/foreman_ansible/job_templates/run_openscap_scans_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/run_playbook-ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_enable_web_console.erb
@@ -207,6 +207,7 @@ files:
 - db/migrate/20191010074208_remove_ansible_implementation_setting.rb
 - db/migrate/20200421201839_update_ansible_inv_template_name.rb
 - db/migrate/20210120150019_add_position_to_ansible_role.rb
+- db/migrate/20210818083407_fix_ansible_setting_category_to_dsl.rb
 - db/seeds.d/100_common_parameters.rb
 - db/seeds.d/62_ansible_proxy_feature.rb
 - db/seeds.d/75_job_templates.rb
@@ -274,6 +275,8 @@ files:
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
+- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
+- test/graphql/queries/ansible_roles_query_test.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
@@ -292,17 +295,55 @@ files:
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/ansible_variables_importer_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/insights_plan_runner_test.rb
 - test/unit/services/inventory_creator_test.rb
+- test/unit/services/override_resolver_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
 - webpack/components/AnsibleHostDetail/AnsibleHostDetail.js
 - webpack/components/AnsibleHostDetail/AnsibleHostDetail.scss
 - webpack/components/AnsibleHostDetail/AnsibleHostDetail.test.js
+- webpack/components/AnsibleHostDetail/components/AnsibleHostInventory/AnsibleHostInventory.js
+- webpack/components/AnsibleHostDetail/components/AnsibleHostInventory/AnsibleHostInventory.scss
+- webpack/components/AnsibleHostDetail/components/AnsibleHostInventory/AnsibleHostInventory.test.js
+- webpack/components/AnsibleHostDetail/components/AnsibleHostInventory/index.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverrides.scss
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTable.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/EditableAction.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/EditableAction.scss
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/EditableActionHelper.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/EditableValue.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/EditableValueHelper.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverrides.fixtures.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverrides.test.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverridesDelete.test.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverridesUpdate.test.js
+- webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/index.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/JobsTabHelper.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobHelper.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.scss
+- webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/RecurringJobsTable.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.fixtures.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.test.js
+- webpack/components/AnsibleHostDetail/components/JobsTab/index.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/AllRolesModal/AllRolesTable.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/AllRolesModal/index.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/EditRolesModal/EditRolesForm.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/EditRolesModal/EditRolesModal.scss
+- webpack/components/AnsibleHostDetail/components/RolesTab/EditRolesModal/EditRolesModalHelper.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/EditRolesModal/index.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/RolesTable.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/__test__/EditRoles.test.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/__test__/RolesTab.fixtures.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/__test__/RolesTab.test.js
+- webpack/components/AnsibleHostDetail/components/RolesTab/index.js
+- webpack/components/AnsibleHostDetail/components/SecondaryTabRoutes.js
+- webpack/components/AnsibleHostDetail/components/TabLayout.js
+- webpack/components/AnsibleHostDetail/constants.js
+- webpack/components/AnsibleHostDetail/helpers.js
 - webpack/components/AnsibleHostDetail/index.js
 - webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.js
 - webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.scss
@@ -311,7 +352,6 @@ files:
 - webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesHelpers.js
 - webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesHelpers.test.js
 - webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesImport.test.js
-- webpack/components/AnsibleRolesAndVariables/__test__/__snapshots__/AnsibleRolesAndVariablesImport.test.js.snap
 - webpack/components/AnsibleRolesAndVariables/index.js
 - webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js
 - webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.scss
@@ -348,10 +388,44 @@ files:
 - webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap
 - webpack/components/AnsibleRolesSwitcher/components/withProtectedView.js
 - webpack/components/AnsibleRolesSwitcher/index.js
+- webpack/components/DualList/DualList.scss
+- webpack/components/DualList/ListControls.js
+- webpack/components/DualList/ListHeader.js
+- webpack/components/DualList/ListItem.js
+- webpack/components/DualList/ListPane.js
+- webpack/components/DualList/SelectedStatus.js
+- webpack/components/DualList/index.js
+- webpack/components/ErrorState.js
 - webpack/components/ReportJsonViewer.js
+- webpack/components/withLoading.js
+- webpack/components/withPagination.js
+- webpack/formHelper.js
+- webpack/globalIdHelper.js
 - webpack/global_index.js
+- webpack/graphql/mutations/assignAnsibleRoles.gql
+- webpack/graphql/mutations/cancelRecurringLogic.gql
+- webpack/graphql/mutations/createAnsibleVariableOverride.gql
+- webpack/graphql/mutations/createJobInvocation.gql
+- webpack/graphql/mutations/deleteAnsibleVariableOverride.gql
+- webpack/graphql/mutations/updateAnsibleVariableOverride.gql
+- webpack/graphql/queries/allAnsibleRoles.gql
+- webpack/graphql/queries/ansibleRoles.gql
+- webpack/graphql/queries/currentUserAttributes.gql
+- webpack/graphql/queries/hostAnsibleRoles.gql
+- webpack/graphql/queries/hostAvailableAnsibleRoles.gql
+- webpack/graphql/queries/hostVariableOverrides.gql
+- webpack/graphql/queries/recurringJobs.gql
+- webpack/helpers/pageParamsHelper.js
+- webpack/helpers/paginationHelper.js
 - webpack/index.js
+- webpack/permissionsHelper.js
 - webpack/reducer.js
+- webpack/routes/HostgroupJobs/__test__/HostgroupJobs.fixtures.js
+- webpack/routes/HostgroupJobs/__test__/HostgroupJobs.test.js
+- webpack/routes/HostgroupJobs/index.js
+- webpack/routes/routes.js
+- webpack/testHelper.js
+- webpack/toastHelper.js
 homepage: https://github.com/theforeman/foreman_ansible
 licenses:
 - GPL-3.0
@@ -371,51 +445,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_variables.rb
-- test/factories/ansible_roles.rb
-- test/factories/host_ansible_enhancements.rb
-- test/fixtures/insights_playbook.yaml
-- test/fixtures/sample_facts.json
-- test/fixtures/report.json
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/ansible_roles_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
+- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
-- test/test_plugin_helper.rb
+- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
+- test/graphql/queries/ansible_roles_query_test.rb
+- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/ansible_variable_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/helpers/ansible_reports_helper_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb
 - test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/fact_sparser_test.rb
 - test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/override_resolver_test.rb
 - test/unit/services/roles_importer_test.rb
-- test/unit/services/structured_fact_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/api_roles_importer_test.rb
-- test/unit/services/fact_parser_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/ansible_provider_test.rb
-- test/unit/host_ansible_role_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
-- test/unit/import_roles_and_variables.rb
+- test/unit/ansible_variable_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/ignore_roles_test.rb
-- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/unit/import_roles_and_variables.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/factories/ansible_proxy.rb
+- test/factories/host_ansible_enhancements.rb
+- test/factories/ansible_variables.rb
+- test/factories/ansible_roles.rb
+- test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/fixtures/insights_playbook.yaml
+- test/test_plugin_helper.rb

data/app/models/foreman_ansible/fact_name.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanAnsible
-  # Define the class that fact names that come from Ansible should have
-  # It allows us to filter facts by origin, and also to display the origin
-  # in the fact values table (/fact_values)
-  class FactName < ::FactName
-    def origin
-      'Ansible'
-    end
-
-    def icon_path
-      'foreman_ansible/Ansible.png'
-    end
-  end
-end

data/app/models/setting/ansible.rb

@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-class Setting
-  # Provide settings related with Ansible
-  class Ansible < ::Setting
-    ::Setting::BLANK_ATTRS.concat %w[ansible_roles_to_ignore]
-    class << self
-      # It would be more disadvantages than advantages to split up
-      # default_settings into multiple methods, this way it's already very
-      # manageable.
-      def default_settings
-        [
-          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 '\
-               'Ansible playbooks. You can override this on hosts by '\
-               'adding a parameter "ansible_connection"'),
-            'ssh',
-            N_('Connection type')
-          ),
-          set(
-            'ansible_winrm_server_cert_validation',
-            N_('Enable/disable WinRM server certificate '\
-               'validation when running Ansible playbooks. You can override '\
-               'this on hosts by adding a parameter '\
-               '"ansible_winrm_server_cert_validation"'),
-            'validate',
-            N_('WinRM cert Validation')
-          ),
-          set(
-            'ansible_verbosity',
-            N_('Foreman will add this level of verbosity for '\
-               'additional debugging output when running Ansible playbooks.'),
-            '0',
-            N_('Default verbosity level'),
-            nil,
-            :collection => lambda do
-              { '0' => N_('Disabled'),
-                '1' => N_('Level 1 (-v)'),
-                '2' => N_('Level 2 (-vv)'),
-                '3' => N_('Level 3 (-vvv)'),
-                '4' => N_('Level 4 (-vvvv)') }
-            end
-          ),
-          set(
-            'ansible_post_provision_timeout',
-            N_('Timeout (in seconds) to set when Foreman will trigger a '\
-               'play Ansible roles task after a host is fully provisioned. '\
-               'Set this to the maximum time you expect a host to take '\
-               'until it is ready after a reboot.'),
-            '360',
-            N_('Post-provision timeout')
-          ),
-          set(
-            'ansible_interval',
-            N_('Timeout (in minutes) when hosts should have reported.'),
-            '30',
-            N_('Ansible report timeout')
-          ),
-          set(
-            'ansible_out_of_sync_disabled',
-            format(N_('Disable host configuration status turning to out of'\
-               ' sync for %{cfgmgmt} after report does not arrive within'\
-               ' configured interval'), :cfgmgmt => 'Ansible'),
-            false,
-            format(N_('%{cfgmgmt} out of sync disabled'),
-                   :cfgmgmt => 'Ansible')
-          ),
-          set(
-            'ansible_inventory_template',
-            N_('Foreman will use this template to schedule the report '\
-               'with Ansible inventory'),
-            'Ansible - Ansible Inventory',
-            N_('Default Ansible inventory report template')
-          ),
-          set(
-            'ansible_roles_to_ignore',
-            N_('Those roles will be excluded when importing roles from smart proxy, '\
-                'The expected input is comma separated values and you can use * wildcard metacharacters'\
-                'For example: foo*, *b*,*bar'),
-            [],
-            N_('Ansible roles to ignore')
-          )
-        ]
-      end
-
-      def load_defaults
-        Setting::BLANK_ATTRS.push('ansible_ssh_private_key_file')
-        super
-      end
-
-      def humanized_category
-        N_('Ansible')
-      end
-    end
-  end
-end

data/app/services/foreman_ansible/fact_importer.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanAnsible
-  # Override methods from Foreman app/services/fact_importer so that Ansible
-  # facts are recognized in Foreman as ForemanAnsible facts. It supports
-  # nested facts.
-  #
-  # Only relevant for 1.12 and lower versions
-  class FactImporter < ::FactImporter
-    def fact_name_class
-      ForemanAnsible::FactName
-    end
-
-    def initialize(host, facts = {})
-      # Try to assign these facts to the correct host as per the facts say
-      # If that host isn't created yet, the host parameter will contain it
-      @host = Host.find_by(:name => facts[:ansible_facts][:ansible_fqdn] ||
-                                    facts[:ansible_facts][:fqdn]) ||
-              host
-      @facts = normalize(facts[:ansible_facts])
-      @original_facts = FactSparser.unsparse(facts[:ansible_facts])
-      @counters = {}
-    end
-
-    private
-
-    def add_new_facts
-      @counters[:added] = 0
-      add_missing_facts(FactSparser.unsparse(@original_facts))
-      logger.debug(
-        "Merging facts for '#{host}': added #{@counters[:added]} facts"
-      )
-    end
-
-    def add_missing_facts(imported_facts, parent = nil, prefix = '')
-      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)
-        fact_name = find_or_create_fact_name(fact_fqn, parent, imported_value)
-        add_fact_value(imported_value, fact_name)
-        add_compose_fact(imported_value, fact_name, fact_fqn)
-      end
-    end
-
-    def add_compose_fact(imported_values, fact_name, fact_fqn)
-      if imported_values.is_a?(Hash)
-        add_missing_facts(imported_values, fact_name, fact_fqn)
-      elsif imported_values.is_a?(Array)
-        imported_values.each do |imported_value|
-          next unless imported_value.is_a?(Hash)
-          add_missing_facts(imported_value, fact_name, fact_fqn)
-        end
-      end
-    end
-
-    def missing_facts
-      @missing_facts ||= facts.keys +
-                         FactSparser.sparse(@original_facts).keys -
-                         host_fact_names
-    end
-
-    def host_fact_names
-      host.fact_names.where(:type => fact_name_class.to_s).pluck(:name)
-    end
-
-    # Returns pairs [id, fact_name]
-    def fact_names
-      fact_name_class.group('name').maximum(:id)
-    end
-
-    # Fact fully qualified name contains an unambiguous name for a fact
-    # e.g: ansible_lo::ipv6, ansible_virbr0::active
-    def fact_fqn(name, prefix)
-      prefix.empty? ? name : prefix + FactName::SEPARATOR + name
-    end
-
-    def find_or_create_fact_name(name, parent, fact_value)
-      return fact_name_class.find(fact_names[name]) if fact_names[name].present?
-      fact_name_class.create!(:name => name,
-                              :parent => parent,
-                              :compose => compose?(fact_value))
-    end
-
-    def add_fact_value(value, fact_name)
-      return unless missing_facts.include?(fact_name.name)
-      method = host.new_record? ? :build : :create!
-      host.fact_values.send(method,
-                            :value => value.to_s,
-                            :fact_name => fact_name)
-      @counters[:added] += 1
-    end
-
-    def compose?(fact_value)
-      fact_value.is_a?(Hash) ||
-        fact_value.is_a?(Array) && fact_value.first.is_a?(Hash)
-    end
-  end
-end

data/app/services/foreman_ansible/fact_parser.rb

@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-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
-
-    # Don't do anything as there's no env in Ansible
-    def environment; end
-
-    def architecture
-      name = facts[:ansible_architecture] || facts[:facter_architecture]
-      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 if name.present?
-    end
-
-    def domain
-      name = detect_fact([:ansible_domain, :facter_domain,
-                          :ohai_domain, :domain])
-      Domain.where(:name => name).first_or_create if name.present?
-    end
-
-    def support_interfaces_parsing?
-      true
-    end
-
-    # Move ansible's default interface first in the list of interfaces since
-    # Foreman picks the first one that is usable. If ansible has no
-    # preference otherwise at least sort the list.
-    #
-    # This method overrides app/services/fact_parser.rb on Foreman and returns
-    # an array of interface names, ['eth0', 'wlan1', etc...]
-    def get_interfaces # rubocop:disable Naming/AccessorMethodName
-      pref = facts[:ansible_default_ipv4] &&
-             facts[:ansible_default_ipv4]['interface']
-      if pref.present?
-        (facts[:ansible_interfaces] - [pref]).unshift(pref)
-      else
-        ansible_interfaces
-      end
-    end
-
-    def get_facts_for_interface(iface_name)
-      interface = iface_name.tr('-', '_') # virbr1-nic -> virbr1_nic
-      interface_facts = facts[:"ansible_#{interface}"]
-      ipaddress = ip_from_interface(interface)
-      ipaddress6 = ipv6_from_interface(interface)
-      macaddress = mac_from_interface(interface)
-      iface_facts = HashWithIndifferentAccess[
-        interface_facts.merge(:ipaddress => ipaddress,
-                              :ipaddress6 => ipaddress6,
-                              :macaddress => macaddress)
-      ]
-      logger.debug { "Ansible interface #{interface} facts: #{iface_facts.inspect}" }
-      iface_facts
-    end
-
-    def ipmi_interface; end
-
-    def boot_timestamp
-      Time.zone.now.to_i - facts['ansible_uptime_seconds'].to_i
-    end
-
-    def virtual
-      facts['ansible_virtualization_role'] == 'guest'
-    end
-
-    def ram
-      facts['ansible_memtotal_mb'].to_i
-    end
-
-    def sockets
-      facts['ansible_processor_count'].to_i
-    end
-
-    def cores
-      facts['ansible_processor_cores'].to_i
-    end
-
-    private
-
-    def ansible_interfaces
-      return [] if facts[:ansible_interfaces].blank?
-      facts[:ansible_interfaces].sort
-    end
-
-    def mac_from_interface(interface)
-      facts[:"ansible_#{interface}"]['perm_macaddress'].presence || facts[:"ansible_#{interface}"]['macaddress']
-    end
-
-    def ip_from_interface(interface)
-      return if facts[:"ansible_#{interface}"]['ipv4'].blank?
-      if facts[:"ansible_#{interface}"]['ipv4'].is_a?(Array)
-        facts[:"ansible_#{interface}"]['ipv4'][0]['address']
-      else
-        facts[:"ansible_#{interface}"]['ipv4']['address']
-      end
-    end
-
-    def ipv6_from_interface(interface)
-      return if facts[:"ansible_#{interface}"]['ipv6'].blank?
-
-      facts[:"ansible_#{interface}"]['ipv6'].first['address']
-    end
-
-    # Returns first non-empty fact. Needed to check for empty strings.
-    def detect_fact(fact_names)
-      facts[
-        fact_names.detect do |fact_name|
-          facts[fact_name].present?
-        end
-      ]
-    end
-  end
-end