foreman_ansible 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08c99d39eecf64143f22351c6320d62cfb1f3314'
-  data.tar.gz: 42133e0cf37fedd36eead1368ae2e05411cc9ab7
+  metadata.gz: 3dd4a02656d2b41202e38c91fda9cd2b5b7bfb08
+  data.tar.gz: a7f7f75580a6d389b09dd3a1bb47c4420b1ffab2
 SHA512:
-  metadata.gz: c3d1e4d553a4621b0a40a19206369dcc3263cdbbb37ad81a23f2a65c36b2a3f06c7bb91d39f2e4f02051409b19be0323112b5949b2c3aeaa267304c5253e8090
-  data.tar.gz: 58a3841d303c241512ee7a8ff947f851fd55ed34132b482919bbea8d6a256262dc15a3b4a774cdc4a63a4575acd1aa94d9849ec9b9b7600f2ea14f4420cfba25
+  metadata.gz: 52866dabe9b2a7bac15bc23920541c896cc337304a1bafcfbe057645ea73c85939cdbc989cec226c7f32f61b254891b345b7720bb1d771074f25ece5feea4d39
+  data.tar.gz: afdbf297b5fe851adb1a71352b7b821b109d203ad094b51ede3f0d7f3658ea0d358f84022040c056bccf8e12b0810e9b68e2c7db0ae3c15488a44825080bc29c

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

@@ -25,7 +25,7 @@ module Api
 
       def create
         @ansible_variable = AnsibleVariable.authorized(:edit_external_variables).
-          find_by_id(params[:ansible_variable_id].to_i)
+                            find_by(:id => params[:ansible_variable_id].to_i)
         @override_value = @ansible_variable.lookup_values.create!(lookup_value_params['override_value'])
         @ansible_variable.update_attribute(:override, true)
         render 'api/v2/ansible_override_values/show'
@@ -35,7 +35,7 @@ module Api
       param :id, :identifier, :required => true
 
       def destroy
-        @override_value = LookupValue.find_by_id(params[:id])
+        @override_value = LookupValue.find_by(:id => params[:id])
         if @override_value
           @ansible_variable = AnsibleVariable.where(:id => @override_value.lookup_key_id)
           @override_value.destroy

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

@@ -8,11 +8,14 @@ module ForemanAnsible
         extend ActiveSupport::Concern
         include ForemanTasks::Triggers
         include ::ForemanAnsible::Concerns::JobInvocationHelper
+        include ::ForemanAnsible::Concerns::ApiCommon
 
         # Included blocks shouldn't be bound by length, as otherwise concerns
         # cannot extend the method properly.
-        # rubocop:disable BlockLength
+        # rubocop:disable BlockLength, Rails/LexicallyScopedActionFilter
         included do
+          before_action :find_ansible_roles, :only => [:assign_ansible_roles]
+
           api :POST, '/hostgroups/:id/play_roles',
               N_('Plays Ansible roles on a hostgroup')
           param :id, :identifier, :required => true
@@ -42,10 +45,23 @@ module ForemanAnsible
           def ansible_roles
             find_resource
             return unless @hostgroup
+
             @ansible_roles = @hostgroup.all_ansible_roles
           end
+
+          api :POST, '/hostgroups/:id/assign_ansible_roles',
+              N_('Assigns Ansible roles to a hostgroup')
+          param :id, :identifier, :required => true
+          param :ansible_role_ids, Array,
+                N_('Ansible roles to assign to a hostgroup'),
+                :required => true
+
+          def assign_ansible_roles
+            find_resource
+            process_response @hostgroup.update(:ansible_roles => @ansible_roles)
+          end
         end
-        # rubocop:enable BlockLength
+        # rubocop:enable BlockLength, Rails/LexicallyScopedActionFilter
 
         private
 
@@ -64,7 +80,8 @@ module ForemanAnsible
 
         def action_permission
           case params[:action]
-          when 'play_roles', 'multiple_play_roles', 'ansible_roles'
+          when 'play_roles', 'multiple_play_roles', 'ansible_roles',
+               'assign_ansible_roles'
             :view
           else
             super

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

@@ -8,13 +8,17 @@ module ForemanAnsible
         extend ActiveSupport::Concern
         include ForemanTasks::Triggers
         include ::ForemanAnsible::Concerns::JobInvocationHelper
+        include ::ForemanAnsible::Concerns::ApiCommon
 
         # Included blocks shouldn't be bound by length, as otherwise concerns
         # cannot extend the method properly.
-        # rubocop:disable BlockLength
+        # rubocop:disable BlockLength, Rails/LexicallyScopedActionFilter
         included do
+          before_action :find_ansible_roles, :only => [:assign_ansible_roles]
+
           def find_resource
             return true if params[:action] == 'multiple_play_roles'
+
             super
           end
 
@@ -44,16 +48,29 @@ module ForemanAnsible
 
           def ansible_roles
             return unless @host
+
             @ansible_roles = @host.all_ansible_roles
           end
+
+          api :POST, '/hosts/:id/assign_ansible_roles',
+              N_('Assigns Ansible roles to a host')
+          param :id, :identifier, :required => true
+          param :ansible_role_ids, Array,
+                N_('Ansible roles to assign to a host'),
+                :required => true
+
+          def assign_ansible_roles
+            process_response @host.update(:ansible_roles => @ansible_roles)
+          end
         end
-        # rubocop:enable BlockLength
+        # rubocop:enable BlockLength, Rails/LexicallyScopedActionFilter
 
         private
 
         def action_permission
           case params[:action]
-          when 'play_roles', 'multiple_play_roles', 'ansible_roles'
+          when 'play_roles', 'multiple_play_roles', 'ansible_roles',
+               'assign_ansible_roles'
             :view
           else
             super

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  module Concerns
+    # Shared task methods between api controllers
+    module ApiCommon
+      extend ActiveSupport::Concern
+
+      def find_ansible_roles
+        ids = params.fetch(:ansible_role_ids, []) || []
+        @ansible_roles = AnsibleRole.authorized(:view_ansible_roles).find(ids)
+      rescue ActiveRecord::RecordNotFound => e
+        not_found(e.message)
+      end
+    end
+  end
+end

data/app/helpers/foreman_ansible/hosts_helper_extensions.rb

@@ -6,16 +6,6 @@ module ForemanAnsible
     extend ActiveSupport::Concern
 
     module Overrides
-      def host_title_actions(*args)
-        host = args.first
-        if ansible_roles_present?(host) &&
-           User.current.can?(:create_job_invocations)
-          button = ansible_roles_button(host)
-          title_actions(button_group(button))
-        end
-        super(*args)
-      end
-
       def multiple_actions
         actions = super
         if User.current.can?(:create_job_invocations) &&
@@ -36,15 +26,5 @@ module ForemanAnsible
       host.ansible_roles.present? ||
         host.inherited_ansible_roles.present?
     end
-
-    def ansible_roles_button(host)
-      display_link_if_authorized(
-        _('Run Ansible roles'),
-        hash_for_play_roles_host_path(:id => host.id),
-        :id => :ansible_roles_button,
-        :class => 'btn btn-default',
-        :'data-no-turbolink' => true
-      )
-    end
   end
 end

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

@@ -13,7 +13,7 @@ module ForemanAnsible
         has_many :ansible_roles, :through => :host_ansible_roles,
                                  :dependent => :destroy
         scoped_search :relation => :ansible_roles, :on => :name,
-                      :complete_value => true, :rename => :role,
+                      :complete_value => true, :rename => :ansible_role,
                       :only_explicit => true
 
         before_provision :play_ansible_roles
@@ -53,21 +53,6 @@ module ForemanAnsible
       (ansible_roles + inherited_ansible_roles).uniq
     end
 
-    def host_params_hash
-      values = AnsibleVariable.where(:ansible_role_id => all_ansible_roles.pluck(:id)).
-               values_hash(self).raw.values
-      transformed = values.each_with_object({}) do |item, memo|
-        item.map do |name, hash|
-          variable = AnsibleVariable.find_by :key => name
-          safe_value = variable.hidden_value? ? variable.safe_value : hash[:value]
-          memo[name] = { :value => hash[:value], :safe_value => safe_value, :source => 'global' }
-        end
-        memo
-      end
-
-      super.merge transformed
-    end
-
     # rubocop:enable Metrics/BlockLength
     # Class methods we may need to override or add
     module ClassMethods

data/app/services/foreman_ansible/ansible_info.rb

@@ -0,0 +1,18 @@
+module ForemanAnsible
+  class AnsibleInfo < ::HostInfo::Provider
+    def host_info
+      { 'parameters' => ansible_params }
+    end
+
+    def ansible_params
+      variables = AnsibleVariable.where(:ansible_role_id => host.all_ansible_roles.pluck(:id), :override => true)
+      values = variables.values_hash(host)
+
+      variables.each_with_object({}) do |var, memo|
+        value = values[var]
+        memo[var.key] = value if value
+        memo
+      end
+    end
+  end
+end

data/app/services/foreman_ansible/insights_plan_runner.rb

@@ -32,7 +32,8 @@ if defined?(RedhatAccess)
         resource = RestClient::Resource.new(
           "#{insights_api_host}/r/insights/"\
           "v3/maintenance/#{@plan_id}/playbook",
-          get_ssl_options_for_org(@organization, nil)
+          get_ssl_options_for_org(@organization, nil).\
+            merge(:proxy => get_portal_http_proxy)
         )
         @raw_playbook = resource.get.body
         YAML.safe_load(@raw_playbook)

data/app/services/foreman_ansible/inventory_creator.rb

@@ -22,7 +22,7 @@ module ForemanAnsible
       hosts = @hosts.map(&:name)
 
       { 'all' => { 'hosts' => hosts,
-                   'vars'  => template_inputs(@template_invocation) },
+                   'vars' => template_inputs(@template_invocation) },
         '_meta' => { 'hostvars' => hosts_vars } }
     end
 
@@ -43,7 +43,7 @@ module ForemanAnsible
       if Setting['top_level_ansible_vars']
         result = result.merge(host_params(host))
       end
-      result
+      result.merge(ansible_params(host))
     end
 
     def connection_params(host)
@@ -68,6 +68,10 @@ module ForemanAnsible
       render_rabl(host, 'api/v2/hosts/main')
     end
 
+    def ansible_params(host)
+      ForemanAnsible::AnsibleInfo.new(host).ansible_params
+    end
+
     def host_params(host)
       host.host_params
     end

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -5,7 +5,7 @@ module ForemanAnsible
   module OperatingSystemParser
     def operatingsystem
       args = { :name => os_name, :major => os_major, :minor => os_minor }
-      args[:release_name] = os_release_name if os_name == 'Debian'
+      args[:release_name] = os_release_name if os_name == 'Debian' || os_name == 'Ubuntu'
       return @local_os if local_os(args).present?
       return @new_os if new_os(args).present?
       logger.debug do
@@ -40,13 +40,9 @@ module ForemanAnsible
       end
     end
 
-    def deb_release_map
-      { '7' => 'wheezy', '8' => 'jessie', '9' => 'stretch', '10' => 'buster' }
-    end
-
     def os_release_name
-      return '' unless os_name == 'Debian'
-      deb_release_map[debian_os_major_sid]
+      return '' if os_name != 'Debian' && os_name != 'Ubuntu'
+      facts[:ansible_distribution_release]
     end
 
     # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity

data/app/views/ansible_roles/index.html.erb

@@ -18,7 +18,7 @@
       <tr>
         <td class="ellipsis"><%= role.name %></td>
         <td class="ellipsis"><%= role.hostgroups.count %></td>
-        <td class="ellipsis"><%= link_to role.hosts.count, hosts_path(:search => "role = #{role.name}")%></td>
+        <td class="ellipsis"><%= link_to role.hosts.count, hosts_path(:search => "ansible_role = #{role.name}")%></td>
         <td class="ellipsis"><%= import_time role %></td>
         <td>
           <%

data/app/views/ansible_variables/_fields.erb

@@ -0,0 +1,67 @@
+<div id='<%= f.object.to_param %>' class='tab-pane fields'>
+  <fieldset>
+    <h2><%= _("Ansible Variable Details") %></h2>
+    <%= text_f f, :key, :disabled => true, :size => "col-md-8" %>
+    <%= f.hidden_field :key %>
+    <%= textarea_f f, :description, :rows => :auto, :size => "col-md-8", :class => "no-stretch" %>
+    <%= select_f f, :ansible_role_id, [f.object.ansible_role], :id, :to_label, {}, :label => _("Ansible Role"), :disabled => true %>
+  </fieldset>
+  <fieldset>
+    <h2><%= _("Default Behavior") %></h2>
+    <h6><%= _("Override the default value of the Ansible variable.") %></h6>
+    <%= checkbox_f(f, :override, :onchange => 'toggleOverrideValue(this)', :size => "col-md-8",
+                   :label_help => _('Mark the variable to be managed by Foreman. When the Ansible role of this variable is assigned to a host, the default value will be added to Ansible inventory as a host variable. Specify matchers to set a different value for such variable.')
+        ) %>
+    <%= param_type_selector(f, false, :onchange => 'keyTypeChange(this)', :disabled => !f.object.override) %>
+    <%= textarea_f f, :default_value, :value => f.object.default_value_before_type_cast, :size => "col-md-8",
+                   :disabled => (!f.object.override || f.object.omit),
+                   :input_group_btn => fullscreen_input,
+                   :rows => 1,
+                   :label_help => _("Value to use when there is no match."),
+                   :class => "no-stretch #{'masked-input' if f.object.hidden_value?}" %>
+    <div class="form-group">
+      <%= checkbox_f(f, :hidden_value, :label => _('Hidden Value'),
+                     :class => 'hidden_value_textarea_switch', :onchange => 'toggle_lookupkey_hidden(this)',
+                     :checked => f.object.hidden_value?,
+                     :label_help => _("Hide all values for this parameter."),
+                     :size => "col-md-1", :label_size => "col-md-2", :table_field => true,
+                     :disabled => !f.object.override) %>
+    </div>
+  </fieldset>
+  <fieldset>
+    <%= collapsing_header _("Optional Input Validator"), "#optional_input_validators_#{f.object.id}", "collapsed" %>
+    <div id="optional_input_validators_<%= f.object.id %>" class="collapse out">
+      <h6><%= _('Before including these variables on your playbooks, Foreman will validate that your variables comply with the validation.') %></h6>
+
+      <%= checkbox_f(f, :required, :size => "col-md-8", :disabled => !f.object.override,
+                     :label_help => _("If checked, will raise an error if there is no default value and no matcher provide a value.")
+          ) %>
+      <%= validator_type_selector f %>
+      <%= text_f f, :validator_rule, :size => "col-md-8", :disabled => f.object.validator_type.blank?, :class => "no-stretch" %>
+    </div>
+  </fieldset>
+  </br>
+  <div class="matcher-parent" <%= "id=#{f.object.key.to_s.gsub(' ', '_')}_lookup_key_override_value" %> style=<%= "display:none;" if !f.object.override %>>
+    <fieldset>
+      <h2><%= _("Prioritize Attribute Order") %></h2>
+      <h6><%= _("Set the order in which values are resolved.") %></h6>
+      <%= textarea_f f, :path, :rows => :auto, :label => _("Order"), :id => 'order', :size => "col-md-8", :onchange => 'fill_in_matchers()', :value => f.object.path, :class => "no-stretch",
+                        :label_help => _("The order in which matchers keys are processed, first match wins.<br> You may use multiple attributes as a matcher key, for example, an order of <code>host group, environment</code> would expect a matcher such as <code>hostgroup = \"web servers\", environment = production</code>").html_safe %>
+      <%= checkbox_f(f, :merge_overrides, :onchange => 'mergeOverridesChanged(this)', :table_field => true,
+                        :disabled => !f.object.supports_merge?, :size => "col-md-1", :label_size => "col-md-2",
+                        :label_help => _("Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted.")) %>
+      <%= checkbox_f(f, :merge_default, :disabled =>  !f.object.merge_overrides, :size => "col-md-1", :table_field => true,
+                        :label_size => "col-md-2", :label_help => _("Include default value when merging all matching values.")) %>
+      <%= checkbox_f(f, :avoid_duplicates, :disabled => (!f.object.supports_uniq? || !f.object.merge_overrides),
+                        :size => "col-md-1", :label_size => "col-md-2", :table_field => true,
+                        :label_help => _("Avoid duplicate values when merging them (only array type)?")) %>
+    </fieldset>
+    </br>
+    <fieldset>
+      <h2><%= _("Specify Matchers") %>  <%= documentation_button('4.2.6SmartMatchers') %></h2>
+      <div class="children_fields lookup_values">
+        <%= render 'lookup_keys/values', :f => f, :is_param => false %>
+      </div>
+    </fieldset>
+  </div>
+</div>

data/app/views/ansible_variables/edit.html.erb

@@ -12,6 +12,6 @@
 ) %>
 <% title(_('Edit Ansible Variable')) %>
 <%= form_for(@ansible_variable) do |f| %>
-    <%= render 'lookup_keys/fields', :f => f %>
+    <%= render 'fields', :f => f %>
     <%= submit_or_cancel f %>
 <% end %>

data/app/views/ansible_variables/index.html.erb

@@ -16,11 +16,11 @@
     <% @ansible_variables.each do |variable| %>
       <tr>
         <td class="ellipsis"><%= link_to_if_authorized(
-          variable.key,
-          hash_for_edit_ansible_variable_path(:id => variable).
-          merge(:auth_object => variable,
-                :permission => 'edit_external_parameters',
-                :authorizer => authorizer)
+            icon_text((variable.override ? "flag": ""), variable.key.to_s, :kind => 'fa', :title => _('Overriden')),
+            hash_for_edit_ansible_variable_path(:id => variable).
+            merge(:auth_object => variable,
+                  :permission => 'edit_external_parameters',
+                  :authorizer => authorizer)
         ) %></td>
         <td class="ellipsis"><%= link_to_if_authorized(
           variable.ansible_role.name,

data/config/routes.rb

@@ -4,9 +4,9 @@
 Rails.application.routes.draw do
   namespace :api do
     scope '(:apiv)',
-          :module      => :v2,
-          :defaults    => { :apiv => 'v2' },
-          :apiv        => /v1|v2/,
+          :module => :v2,
+          :defaults => { :apiv => 'v2' },
+          :apiv => /v1|v2/,
           :constraints => ApiConstraints.new(:version => 2) do
 
       constraints(:id => %r{[^\/]+}) do
@@ -14,6 +14,7 @@ Rails.application.routes.draw do
           member do
             post :play_roles
             get :ansible_roles
+            post :assign_ansible_roles
           end
           collection do
             post :multiple_play_roles
@@ -23,6 +24,7 @@ Rails.application.routes.draw do
           member do
             post :play_roles
             get :ansible_roles
+            post :assign_ansible_roles
           end
           collection do
             post :multiple_play_roles
@@ -52,6 +54,7 @@ Rails.application.routes.draw do
       collection do
         get :import
         post :confirm_import
+        get 'auto_complete_search'
       end
     end
 
@@ -66,9 +69,9 @@ Rails.application.routes.draw do
 
     namespace :api do
       scope '(:apiv)',
-            :module      => :v2,
-            :defaults    => { :apiv => 'v2' },
-            :apiv        => /v1|v2/,
+            :module => :v2,
+            :defaults => { :apiv => 'v2' },
+            :apiv => /v1|v2/,
             :constraints => ApiConstraints.new(:version => 2) do
 
         resources :ansible_roles, :only => [:show, :index, :destroy] do

data/db/seeds.d/90_notification_blueprints.rb

@@ -7,7 +7,7 @@ blueprints = [
     :message => N_('Insights remediation on %{hosts_count}' \
                    ' host(s) has finished successfully'),
     :level => 'success',
-    :actions =>           {
+    :actions => {
       :links => [
         :path_method => :job_invocation_path,
         :title => N_('Job Details')

data/lib/foreman_ansible/register.rb

@@ -16,7 +16,7 @@ Foreman::Plugin.register :foreman_ansible do
                                           :multiple_play_roles] },
                :resource_type => 'Hostgroup'
     permission :view_ansible_roles,
-               { :ansible_roles => [:index],
+               { :ansible_roles => [:index, :auto_complete_search],
                  :'api/v2/ansible_roles' => [:index, :show, :fetch] },
                :resource_type => 'AnsibleRole'
     permission :destroy_ansible_roles,
@@ -34,7 +34,9 @@ Foreman::Plugin.register :foreman_ansible do
                },
                :resource_type => 'AnsibleVariable'
     permission :edit_ansible_variables,
-               { :ansible_variables => [:edit, :update] },
+               { :ansible_variables => [:edit, :update],
+                 :'api/v2/ansible_variables' => [:update],
+                 :'api/v2/ansible_override_values' => [:create, :destroy] },
                :resource_type => 'AnsibleVariable'
     permission :destroy_ansible_variables,
                {
@@ -54,6 +56,12 @@ Foreman::Plugin.register :foreman_ansible do
     permission :view_hostgroups,
                { :'api/v2/hostgroups' => [:ansible_roles] },
                :resource_type => 'Hostgroup'
+    permission :edit_hosts,
+               { :'api/v2/hosts' => [:assign_ansible_roles] },
+               :resource_type => 'Host'
+    permission :edit_hostgroups,
+               { :'api/v2/hostgroups' => [:assign_ansible_roles] },
+               :resource_type => 'Hostgroup'
   end
 
   role 'Ansible Roles Manager',
@@ -84,6 +92,8 @@ Foreman::Plugin.register :foreman_ansible do
     "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"
   ]
 
+  register_info_provider ForemanAnsible::AnsibleInfo
+
   # For backwards compatiblity with 1.17
   if respond_to?(:register_report_scanner)
     register_report_scanner ForemanAnsible::AnsibleReportScanner

data/lib/foreman_ansible/remote_execution.rb

@@ -17,9 +17,10 @@ module ForemanAnsible
     def self.register_rex_feature
       RemoteExecutionFeature.register(
         :ansible_run_host,
-        N_('Ansible: Run host roles'),
+        N_('Run Ansible roles'),
         :description => N_('Runs an Ansible playbook which contains all'\
-                           ' the roles defined for a host')
+                           ' the roles defined for a host'),
+        :host_action_button => true
       )
       RemoteExecutionFeature.register(
         :ansible_run_insights_plan,

data/lib/foreman_ansible/version.rb

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

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

@@ -49,6 +49,19 @@ module Api
         response = JSON.parse(@response.body)
         assert_equal @ansible_role1.id, response.first['id']
       end
+
+      test 'should assign a role to a hostgroup' do
+        hostgroup = FactoryBot.create(:hostgroup,
+                                      :ansible_role_ids => [])
+        post :assign_ansible_roles,
+             :params => {
+               :id => hostgroup.id,
+               :ansible_role_ids => [@ansible_role1.id]
+             },
+             :session => set_session_user
+        assert_response :success
+        assert assigns('hostgroup').ansible_roles, [@ansible_role1]
+      end
     end
   end
 end

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

@@ -72,6 +72,20 @@ module Api
         response = JSON.parse(@response.body)
         assert_equal @ansible_role1.id, response.first['id']
       end
+
+      test 'should assign a role to a host' do
+        host = FactoryBot.create(:host,
+                                 :managed => false,
+                                 :ansible_role_ids => [])
+        post :assign_ansible_roles,
+             :params => {
+               :id => host.id,
+               :ansible_role_ids => [@ansible_role1.id]
+             },
+             :session => set_session_user
+        assert_response :success
+        assert assigns('host').ansible_roles, [@ansible_role1]
+      end
     end
   end
 end

data/test/unit/services/fact_parser_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanAnsible
@@ -115,18 +116,23 @@ module ForemanAnsible
           '_timestamp' => '2015-10-29 20:01:51 +0100',
           'ansible_facts' =>
           {
-            'ansible_distribution_major_version' => 'buster/sid',
-            'ansible_distribution' => 'Debian'
+            "ansible_distribution" => "Debian",
+            "ansible_distribution_file_parsed" => true,
+            "ansible_distribution_file_path" => "/etc/os-release",
+            "ansible_distribution_file_variety" => "Debian",
+            "ansible_distribution_major_version" => "8",
+            "ansible_distribution_release" => "jessie",
+            "ansible_distribution_version" => "8.7"
           }
         )
       )
     end
 
-    test 'Parses debian unstable aka sid correctly' do
+    test 'Parses debian jessie correctly' do
       as_admin do
         os = @facts_parser.operatingsystem
 
-        assert_equal '10', os.major
+        assert_equal '8', os.major
         assert_equal 'Debian', os.name
       end
     end

data/test/unit/services/inventory_creator_test.rb

@@ -11,7 +11,7 @@ module ForemanAnsible
       @host = FactoryBot.build(:host)
       @template_invocation = OpenStruct.new(
         :job_invocation => OpenStruct.new(:password => 'foobar',
-					 :sudo_password => 'foobar'),
+                                          :sudo_password => 'foobar'),
         :effective_user => 'foobar'
       )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -129,6 +129,7 @@ files:
 - 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/api_common.rb
 - app/controllers/foreman_ansible/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_ansible/concerns/hosts_controller_extensions.rb
 - app/controllers/foreman_ansible/concerns/import_controller_helper.rb
@@ -150,10 +151,10 @@ files:
 - app/models/hostgroup_ansible_role.rb
 - app/models/setting/ansible.rb
 - app/overrides/ansible_roles_tab.rb
-- app/overrides/ansible_variables_edit.rb
 - app/overrides/hostgroup_ansible_roles_tab.rb
 - app/overrides/hostgroup_play_roles.rb
 - app/overrides/report_output.rb
+- app/services/foreman_ansible/ansible_info.rb
 - app/services/foreman_ansible/ansible_report_importer.rb
 - app/services/foreman_ansible/ansible_report_scanner.rb
 - app/services/foreman_ansible/api_roles_importer.rb
@@ -174,8 +175,7 @@ files:
 - app/views/ansible_roles/import.html.erb
 - app/views/ansible_roles/index.html.erb
 - app/views/ansible_roles/welcome.html.erb
-- app/views/ansible_variables/_ansible_roles_list.html.erb
-- app/views/ansible_variables/_validator_text.html.erb
+- app/views/ansible_variables/_fields.erb
 - app/views/ansible_variables/edit.html.erb
 - app/views/ansible_variables/import.html.erb
 - app/views/ansible_variables/index.html.erb

data/app/overrides/ansible_variables_edit.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-Deface::Override.new(
-  :virtual_path => 'lookup_keys/_fields',
-  :name => 'ansible_variables_edit',
-  :replace => "erb[loud]:contains('show_puppet_class')",
-  :partial => 'ansible_variables/ansible_roles_list'
-)
-
-Deface::Override.new(
-  :virtual_path => 'lookup_keys/_fields',
-  :name => 'ansible_variables_validator_text',
-  :replace => '.out.collapse > h6',
-  :partial => 'ansible_variables/validator_text'
-)

data/app/views/ansible_variables/_ansible_roles_list.html.erb

@@ -1,15 +0,0 @@
-<% if f.object.is_a? ::AnsibleVariable %>
-  <%=
-    select_f(
-      f,
-      :ansible_role_id,
-      [f.object.ansible_role],
-      :id,
-      :to_label,
-      {},
-      { :label => _("Ansible Role"), :disabled => true }
-    )
-  %>
-<% else %>
-  <%= show_puppet_class(f) %>
-<% end %>

data/app/views/ansible_variables/_validator_text.html.erb

@@ -1,5 +0,0 @@
-<% if f.object.is_a? ::AnsibleVariable %>
-  <h6><%= _('Before including these variables on your playbooks, Foreman will validate that your variables comply with the validation.') %></h6>
-<% else %>
-  <h6><%= _('If ERB is used in a parameter value, the validation of the value will happen during the ENC request. If the value is invalid, the ENC request will fail.') %></h6>
-<% end %>