foreman_ansible 6.0.2 → 6.3.1

data/app/models/foreman_ansible/ansible_provider.rb

@@ -27,7 +27,8 @@ if defined? ForemanRemoteExecution
             :remote_execution_command => ansible_command?(
               template_invocation.template
             ),
-            :name => host.name
+            :name => host.name,
+            :check_mode => host.host_param('ansible_roles_check_mode')
           )
         end
 

data/app/models/host_ansible_role.rb

@@ -4,6 +4,7 @@
 class HostAnsibleRole < ApplicationRecord
   belongs_to_host
   belongs_to :ansible_role
+  acts_as_list scope: :host
 
   validates :ansible_role_id, :presence => true,
                               :uniqueness => { :scope => :host_id }

data/app/models/hostgroup_ansible_role.rb

@@ -4,6 +4,7 @@
 class HostgroupAnsibleRole < ApplicationRecord
   belongs_to :hostgroup
   belongs_to :ansible_role
+  acts_as_list scope: :hostgroup
 
   validates :ansible_role_id, :presence => true,
                               :uniqueness => { :scope => :hostgroup_id }

data/app/models/setting/ansible.rb

@@ -3,6 +3,7 @@
 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
@@ -80,6 +81,14 @@ class Setting
                '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

data/app/services/foreman_ansible/ansible_report_importer.rb

@@ -18,6 +18,10 @@ module ForemanAnsible
         partial_hostname_match(hostname)
       end
 
+      def self.authorized_smart_proxy_features
+        super + ['Ansible']
+      end
+
       def partial_hostname_match(hostname)
         return @host unless @host.new_record?
         hosts = Host.where(Host.arel_table[:name].matches("#{hostname}.%"))

data/app/services/foreman_ansible/ansible_report_scanner.rb

@@ -5,7 +5,21 @@ module ForemanAnsible
   # sets the origin of the report to 'Ansible'
   class AnsibleReportScanner
     class << self
-      def add_reporter_data(report, raw); end
+      def add_reporter_data(_report, raw)
+        check_mode_message = raw['check_mode'] ? 'check_mode_enabled' : 'check_mode_disabled'
+        check_mode_log = {
+          'log': {
+            'sources': {
+              'source': 'check_mode'
+            },
+            'messages': {
+              'message': check_mode_message
+            },
+            'level': 'info'
+          }
+        }
+        raw['logs'].insert(0, check_mode_log.deep_stringify_keys)
+      end
 
       def identify_origin(raw)
         'Ansible' if ansible_report?(raw)

data/app/services/foreman_ansible/api_roles_importer.rb

@@ -3,15 +3,31 @@
 module ForemanAnsible
   # imports Ansible roles through API
   class ApiRolesImporter < RolesImporter
-    def import!(role_names = nil)
-      new_roles = import_role_names[:new]
-      if role_names.present?
-        new_roles.select! do |role|
-          role_names.include?(role.name)
+    include ::ForemanAnsible::AnsibleRolesDataPreparations
+
+    def import!(role_names)
+      @roles_importer = ForemanAnsible::UiRolesImporter.new(@ansible_proxy)
+      @variables_importer = ForemanAnsible::VariablesImporter.new(@ansible_proxy)
+      params = { 'changed' => {} }
+      roles = prepare_ansible_import_rows(@roles_importer.import!, @variables_importer, false)
+      roles.each do |role|
+        if role_names.include? role[:name]
+          params['changed'][role[:kind]] ||= {}
+          params['changed'][role[:kind]][role[:name]] = { 'id' => role[:id], 'name' => role[:name] }
         end
       end
-      new_roles.map(&:save)
-      new_roles
+      params
+    end
+
+    def confirm_import(params)
+      @roles_importer.finish_import(params['changed'])
+      @variables_importer.import_variables_roles(params['changed']) if params['changed']['new'] || params['changed']['old']
+    end
+
+    def confirm_sync(params)
+      job = SyncRolesAndVariables.perform_later(params['changed'], @ansible_proxy)
+      task = ForemanTasks::Task.find_by(external_id: job.provider_job_id)
+      task
     end
 
     def obsolete!
@@ -19,9 +35,5 @@ module ForemanAnsible
       obsolete_roles.map(&:destroy)
       obsolete_roles
     end
-
-    def fetch!
-      fetch_role_names
-    end
   end
 end

data/app/services/foreman_ansible/fact_parser.rb

@@ -72,6 +72,22 @@ module ForemanAnsible
       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
@@ -85,7 +101,11 @@ module ForemanAnsible
 
     def ip_from_interface(interface)
       return if facts[:"ansible_#{interface}"]['ipv4'].blank?
-      facts[:"ansible_#{interface}"]['ipv4']['address']
+      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)

data/app/services/foreman_ansible/import_roles_and_variables_error_notification.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  class ImportRolesAndVariablesErrorNotification < ::UINotifications::Base
+    private
+
+    def initialize(error, task)
+      @job_error = error
+      @subject = task
+    end
+
+    def create
+      ::Notification.create!(
+        :audience => Notification::AUDIENCE_USER,
+        :notification_blueprint => blueprint,
+        :initiator => initiator,
+        :message => message,
+        :subject => subject
+      )
+    end
+
+    def blueprint
+      name = 'Sync_roles_and_variables_failed'
+      @blueprint ||= NotificationBlueprint.unscoped.find_by(:name => name)
+    end
+
+    def message
+      _("Failed to import roles and variables Due to: #{@job_error}")
+    end
+  end
+end

data/app/services/foreman_ansible/import_roles_and_variables_success_notification.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  class ImportRolesAndVariablesSuccessNotification < ::UINotifications::Base
+    private
+
+    def create
+      ::Notification.create!(
+        :audience => Notification::AUDIENCE_USER,
+        :notification_blueprint => blueprint,
+        :initiator => initiator,
+        :message => message,
+        :subject => subject
+      )
+    end
+
+    def blueprint
+      name = 'Sync_roles_and_variables_successfully'
+      @blueprint ||= NotificationBlueprint.unscoped.find_by(:name => name)
+    end
+
+    def message
+      blueprint.message
+    end
+  end
+end

data/app/services/foreman_ansible/inventory_creator.rb

@@ -99,7 +99,7 @@ module ForemanAnsible
       params = {
         'ansible_user' => host_setting(host, 'remote_execution_ssh_user'),
         'ansible_become_method' => host_setting(host, 'remote_execution_effective_user_method'),
-        'ansible_ssh_private_key_file' => ansible_or_rex_ssh_private_key(host),
+        'ansible_ssh_private_key_file' => ansible_ssh_private_key(host),
         'ansible_port' => host_setting(host, 'remote_execution_ssh_port'),
         'ansible_host' => AnsibleProvider.find_ip_or_hostname(host)
       }
@@ -122,13 +122,9 @@ module ForemanAnsible
       result
     end
 
-    def ansible_or_rex_ssh_private_key(host)
+    def ansible_ssh_private_key(host)
       ansible_private_file = host_setting(host, 'ansible_ssh_private_key_file')
-      if !ansible_private_file.empty?
-        ansible_private_file
-      else
-        ForemanRemoteExecutionCore.settings[:ssh_identity_key_file]
-      end
+      ansible_private_file unless ansible_private_file.empty?
     end
 
     private

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -80,8 +80,14 @@ module ForemanAnsible
         facts[:ansible_os_name].tr(" \n\t", '') ||
           facts[:ansible_distribution].tr(" \n\t", '')
       else
-        facts[:ansible_distribution] ||
-          facts[:ansible_lsb] && facts[:ansible_lsb]['id']
+        distribution = facts[:ansible_lsb].try(:[], 'id') || facts[:ansible_distribution]
+
+        if distribution == 'RedHat' &&
+           facts[:ansible_lsb].try(:[], 'id') == 'RedHatEnterpriseWorkstation'
+          distribution += '_Workstation'
+        end
+
+        distribution
       end
     end
 

data/app/services/foreman_ansible/roles_importer.rb

@@ -7,6 +7,7 @@ module ForemanAnsible
 
     def initialize(proxy = nil)
       @ansible_proxy = proxy
+      @variables_importer = ForemanAnsible::VariablesImporter.new(@ansible_proxy)
     end
 
     def import_role_names
@@ -26,8 +27,8 @@ module ForemanAnsible
 
     def detect_changes(imported)
       changes = {}.with_indifferent_access
-      old, changes[:new] = imported.partition { |role| role.id.present? }
-      changes[:obsolete] = ::AnsibleRole.where.not(:id => old.map(&:id))
+      changes[:old], changes[:new] = imported.partition { |role| role.id.present? }
+      changes[:obsolete] = ::AnsibleRole.where.not(:id => changes[:old].map(&:id))
       changes
     end
 

data/app/services/foreman_ansible/ui_roles_importer.rb

@@ -15,13 +15,13 @@ module ForemanAnsible
 
     def create_new_roles(changes)
       changes.each_pair do |_, new_role|
-        ::AnsibleRole.create(JSON.parse(new_role))
+        ::AnsibleRole.create(new_role)
       end
     end
 
     def delete_old_roles(changes)
       changes.each_pair do |_, old_role|
-        ::AnsibleRole.find(JSON.parse(old_role)['id']).destroy
+        ::AnsibleRole.find(old_role['id']).destroy
       end
     end
   end

data/app/services/foreman_ansible/variables_importer.rb

@@ -26,6 +26,10 @@ module ForemanAnsible
       import_variables(local_variables, new_roles)
     end
 
+    def get_variables_names(role_name)
+      remote_variables[role_name]
+    end
+
     def import_variables(role_variables, new_roles)
       detect_changes(
         role_variables.map do |role_name, variables|
@@ -37,6 +41,34 @@ module ForemanAnsible
       )
     end
 
+    def import_variables_roles(roles)
+      if roles['new']
+        imported_roles = roles['new'].keys
+        variables_to_import = {}
+        remote_variables.each do |role, variables|
+          next unless imported_roles.include? role
+          role_obj = AnsibleRole.find_by(:name => role)
+          variables_to_import[role] = {}
+          values = initialize_variables(variables, role_obj)
+          values.each do |value|
+            variables_to_import[role][value.key] = value.attributes.to_json
+          end
+        end
+        create_new_variables(variables_to_import)
+      end
+      return if roles['old'].empty?
+      variables_to_update = { 'new' => {}, 'obsolete' => {}, 'update' => {} }
+      import_variable_names([]).each do |kind, variables|
+        variables.each do |variable|
+          next unless roles['old'].values.map { |role| role['id'] }.include?(variable.ansible_role_id)
+          role_name = variable.ansible_role.name
+          variables_to_update[kind][role_name] ||= {}
+          variables_to_update[kind][role_name][variable.key] = variable.attributes.to_json
+        end
+      end
+      finish_import(variables_to_update['new'], variables_to_update['obsolete'], variables_to_update['update'])
+    end
+
     def import_new_role(role_name, new_roles)
       role = AnsibleRole.find_by(:name => role_name)
       if role.blank? && new_roles.map(&:name).include?(role_name)
@@ -51,7 +83,8 @@ module ForemanAnsible
           :key => variable_name,
           :ansible_role_id => role.id
         )
-        variable.assign_attributes(:default_value => variable_default,
+        variable.assign_attributes(:hidden_value => false,
+                                   :default_value => variable_default,
                                    :key_type => infer_key_type(variable_default))
         variable.imported = true if variable.new_record?
         variable.valid? ? variable : nil
@@ -80,6 +113,8 @@ module ForemanAnsible
         variable = AnsibleVariable.new(
           JSON.parse(attrs)
         )
+        # Make sure, newly created variables are not hidden
+        variable.hidden_value = false
         variable.ansible_role = ::AnsibleRole.find_by(:name => role)
         variable.save
         memo << variable

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

@@ -1,51 +1,11 @@
 <% title _("Changed Ansible roles") %>
-<%= form_tag confirm_import_ansible_roles_path do %>
-  <h4><%= _("Select the changes you want to realize in Foreman") %></h4>
-  <h6>
-  <%= _("Toggle") %>:
-  <%= link_to_function(icon_text("check", _("New")),
-                       "toggleCheckboxesBySelector('.role_select_boxes_new')",
-                       :title => _("Check/Uncheck new")) %> |
-  <%= link_to_function(icon_text("check", _("Obsolete")),
-                       "toggleCheckboxesBySelector('.role_select_boxes_obsolete')",
-                       :title => _("Check/Uncheck obsolete")) %>
-  </h6>
-  <table class="<%= table_css_classes %>">
-    <thead>
-      <tr>
-        <th class="ca">
-          <%= link_to_function(icon_text("check"),
-                               "toggleCheckboxesBySelector('.role_select_boxes')",
-                               :title => _("Check/Uncheck all")) %>
-        </th>
-        <th><%= _("Name") %></th>
-        <th class="col-md-2"><%= _("Hosts count") %></th>
-        <th class="col-md-2"><%= _("Hostgroups count") %></th>
-        <th><%= _("Operation") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% changed.each do |kind, roles| %>
-        <% roles.each do |role| %>
-          <tr>
-            <td>
-              <%= check_box_tag "changed[#{kind}][#{role}]", role.to_json, false, :class => "role_select_boxes role_select_boxes_#{kind} role_select_boxes_role_#{role}" %>
-            </td>
-            <td>
-              <%= link_to_function("#{role}", "toggleCheckboxesBySelector('.role_select_boxes_role_#{role}')", :title => _("Check/Uncheck all %s changes") % role) %>
-            </td>
-            <td><%= role.hosts.count %></td>
-            <td><%= role.hostgroups.count %></td>
-            <td>
-              <%= { "new" => _("Add"), "obsolete" => _("Remove") }[kind] %>
-            </td>
-          </tr>
-        <% end %>
-      <% end %>
-    </tbody>
-  </table>
-  <div>
-    <%= link_to _("Cancel"), ansible_roles_path, :class => "btn btn-default" %>
-    <%= submit_tag _("Update"), :class => "btn btn-primary" %>
-  </div>
-<% end %>
+<%= webpacked_plugins_js_for :foreman_ansible %>
+<%= webpacked_plugins_css_for :foreman_ansible %>
+
+
+<%= react_component(
+        'WrappedImportRolesAndVariables',
+        :rowsData => @rows,
+        :proxy => @proxy.id
+    ) %>
+

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

@@ -1,8 +1,7 @@
 <% title _("Ansible Variables") %>
 <%= stylesheet 'foreman_ansible/foreman-ansible' %>
 
-<%= title_actions ansible_proxy_import(hash_for_import_ansible_variables_path),
-      display_link_if_authorized(_('New Ansible Variable'), hash_for_new_ansible_variable_path, :class => "btn btn-default no-float"),
+<%= title_actions display_link_if_authorized(_('New Ansible Variable'), hash_for_new_ansible_variable_path, :class => "btn btn-default no-float"),
       documentation_button('#4.3Variables', :root_url => ansible_doc_url)
        %>