foreman_ansible 6.0.2 → 6.4.0

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)
        %>
 

data/app/views/api/v2/ansible_roles/sync.json.rabl

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+object @task
+
+attributes :id, :action, :state, :result, :start_at

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

@@ -2,22 +2,13 @@
 <%= webpacked_plugins_css_for :foreman_ansible %>
 
 <div class='tab-pane' id='ansible_roles'>
-  <% roles = f.object.is_a?(Hostgroup) ? roles_attrs(f.object.inherited_and_own_ansible_roles) : roles_attrs(f.object.all_ansible_roles) %>
   <% class_name = f.object.is_a?(Hostgroup) ? 'Hostgroup' : 'Host' %>
-  <%= content_tag(:div, '',
-                  :id => 'ansible_roles_switcher',
-                  'data-roles' => {
-                    :initialAssignedRoles => roles,
-                    :inheritedRoleIds => f.object.inherited_ansible_roles.map(&:id),
-                    :availableRolesUrl => ui_ansible_roles_path,
-                    :resourceId => f.object.id,
-                    :resourceName => class_name,
-                    :canView => User.current.can?(:view_ansible_roles)
-                  }.to_json
-  ) %>
-  <% unless request.xhr? %>
-    <script type="text/javascript">
-      tfm.initAnsibleRoleSwitcher();
-    </script>
-  <% end %>
+  <%= react_component('AnsibleRolesSwitcher', {
+                                                :initialAssignedRoles => role_attributes_for_roles_switcher(f.object),
+                                                :inheritedRoleIds => f.object.inherited_ansible_roles.map(&:id),
+                                                :availableRolesUrl => ui_ansible_roles_path,
+                                                :resourceId => f.object.id,
+                                                :resourceName => class_name,
+                                                :canView => User.current.can?(:view_ansible_roles)
+                                              }) %>
 </div>

data/app/views/foreman_ansible/config_reports/_ansible.html.erb

@@ -1,23 +1,39 @@
 <%= webpacked_plugins_js_for :foreman_ansible %>
 <%= stylesheet 'foreman_ansible/foreman-ansible' %>
+<% if ansible_run_in_check_mode?(logs.first) %>
+  <%= alert :class => 'alert-info',
+            :header => _('Ansible check mode'),
+            :text => _('Notice that ansible roles run in check mode.')%>
 
+<% end %>
 <table id='report_log' class="<%= table_css_classes %>">
   <thead>
     <tr>
       <th><%= _("Level") %></th>
-      <th><%= _("Module") %></th>
-      <th><%= _("Arguments") %></th>
+      <th><%= _("Task") %></th>
       <th><%= _("Message") %></th>
     </tr>
   </thead>
   <tbody>
     <% logs.each do |log| %>
-      <tr>
-        <td><span <%= report_tag log.level %>><%= h log.level %></span></td>
-        <td><%= ansible_module_name(log) %></td>
-        <td><%= ansible_module_args(log) %></td>
-        <td><%= ansible_module_message(log) %></td>
-      </tr>
+      <% unless check_mode_log?(log) %>
+        <tr>
+          <td><span <%= report_tag log.level %>><%= h log.level %></span></td>
+          <td><span title=<%= ansible_module_name(log) %>><%= ansible_task_name(log) %></span></td>
+          <td>
+            <% log_message = ansible_module_message(log) %>
+            <% if log_message.is_a? Array %>
+              <ul>
+                <% log_message.each do |message_line| %>
+                  <li><%= message_line %></li>
+                <% end %>
+              </ul>
+            <% else %>
+              <%= log_message %>
+          <% end %>
+          </td>
+        </tr>
+      <% end %>
     <% end %>
     <tr id='ntsh' <%= "style='display: none;'".html_safe if logs.size > 0%>><td colspan="3">
         <%= _("Nothing to show") %>

data/app/views/foreman_ansible/job_templates/ansible_collections_-_install_from_galaxy.erb

@@ -0,0 +1,28 @@
+<%#
+name: Ansible Collection - Install from Galaxy
+job_category: Ansible Galaxy
+description_format: Install collections '%{ansible_collections_list}' from Galaxy
+snippet: false
+template_inputs:
+- name: ansible_collections_list
+  required: true
+  input_type: user
+  description: "List of collections in Ansible Galaxy to install, separated by commas, e.g:
+    mysql,nginx\r\n\r\nThe default collections_paths is configured in /etc/ansible/ansible.cfg,
+    you may override it by filling the 'collections_path' input.
+    Click on \"Advanced\" to see it."
+  advanced: false
+- name: collections_path
+  required: false
+  input_type: user
+  description: A particular directory where you want the downloaded collections to be placed.
+  advanced: true
+provider_type: Ansible
+kind: job_template
+model: JobTemplate
+%>
+
+---
+- hosts: all
+  tasks:
+    - command: ansible-galaxy collection install <%= input('ansible_collections_list').split(",").join(' ') %> -p <%= input('collections_path').present? ? input('collections_path') : '/etc/ansible/collections' %>

data/app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb

@@ -15,10 +15,14 @@ model: JobTemplate
     - name: Display all parameters known for the Foreman host
       debug:
         var: foreman
+      tags:
+        - always
   tasks:
     - name: Apply roles
       include_role:
         name: "{{ role }}"
+      tags:
+        - always
       loop: "{{ foreman_ansible_roles }}"
       loop_control:
         loop_var: role

data/app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb

@@ -25,7 +25,7 @@ model: JobTemplate
 ---
 - hosts: all
   tasks:
-    - command: ansible-galaxy install {{ item }} <% "-p #{input('location')}" if input('location').present? %>
+    - command: ansible-galaxy install {{ item }} -p <%= input('location').present? ? input('location') : '/etc/ansible/roles' %>
       register: out
       with_items:
         - <%= input('ansible_roles_list') %>

data/app/views/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb

@@ -34,11 +34,10 @@ feature: ansible_run_capsule_upgrade
         msg: "This playbook cannot be executed on a Satellite server. Use only on a Capsule server."
       when: "'satellite' in ansible_facts.packages"
 
-    - name: Install satellite-maintain if not present
+    - name: Install|Update satellite-maintain if not present
       package:
         name: rubygem-foreman_maintain
-        state: present
-      when: "'rubygem-foreman_maintain' not in ansible_facts.packages"
+        state: latest
 
     - block:
       <%- whitelist_option = if input('whitelist_options').present?

data/app/views/foreman_ansible/job_templates/convert_to_rhel.erb

@@ -0,0 +1,44 @@
+<%#
+name: Convert to RHEL
+snippet: false
+template_inputs:
+- name: Activation Key
+  required: true
+  input_type: user
+  advanced: false
+  value_type: plain
+  resource_type: Katello::ActivationKey
+  hidden_value: false
+- name: Restart
+  required: true
+  input_type: user
+  options: "yes\r\nno"
+  advanced: false
+  value_type: plain
+  resource_type: Katello::ActivationKey
+  hidden_value: false
+model: JobTemplate
+job_category: Convert 2 RHEL
+provider_type: Ansible
+kind: job_template
+%>
+---
+- hosts: all
+  tasks:
+    - name: Install convert2rhel
+      ansible.builtin.package:
+        name: convert2rhel
+        state: present
+    - name: Prepopulate katello-ca-consumer
+      get_url:
+        url: <%= subscription_manager_configuration_url(@host) %>
+        dest: /usr/share/convert2rhel/subscription-manager/katello-ca-consumer-latest.noarch.rpm
+    - name: Start convert2rhel
+      command: convert2rhel -y --activationkey "<%= input('Activation Key') %>" --org "<%= @host.organization.label %>" > /root/convert2rhel.log
+<%- if input('Restart') == "yes" -%>
+    - name: Reboot the machine
+      reboot:
+        reboot_timeout: 1800
+<%- end -%>
+    - name: Update system facts
+      command: subscription-manager facts --update

data/config/routes.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  namespace :api do
+  namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)',
           :module => :v2,
-          :defaults => { :apiv => 'v2' },
-          :apiv => /v1|v2/,
-          :constraints => ApiConstraints.new(:version => 2) do
+          :defaults => { apiv: 'v2' },
+          :apiv => /v2/,
+          :constraints => ApiConstraints.new(version: 2, default: true) do
       constraints(:id => %r{[^\/]+}) do
         resources :hosts, :only => [] do
           member do
@@ -76,6 +76,7 @@ Rails.application.routes.draw do
         resources :ansible_roles, :only => [:show, :index, :destroy] do
           collection do
             put :import
+            put :sync
             put :obsolete
             get :fetch
           end

data/db/migrate/20210120150019_add_position_to_ansible_role.rb

@@ -0,0 +1,27 @@
+class AddPositionToAnsibleRole < ActiveRecord::Migration[6.0]
+  def change
+    add_column :host_ansible_roles, :position, :integer
+    add_column :hostgroup_ansible_roles, :position, :integer
+
+    update_hostgroup_ansible_roles
+    update_host_ansible_roles
+    change_column_null :host_ansible_roles, :position, false
+    change_column_null :hostgroup_ansible_roles, :position, false
+  end
+
+  def update_host_ansible_roles
+    HostAnsibleRole.all.pluck(:host_id, :id).group_by(&:first).each do |_host_id, role_ids|
+      role_ids.each_with_index do |(_host_id, host_role_id), idx|
+        HostAnsibleRole.find(host_role_id).update(position: idx + 1)
+      end
+    end
+  end
+
+  def update_hostgroup_ansible_roles
+    HostgroupAnsibleRole.all.pluck(:hostgroup_id, :id).group_by(&:first).each do |_hostgroup_id, role_ids|
+      role_ids.each_with_index do |(_hostgroup_id, hostgroup_role_id), idx|
+        HostgroupAnsibleRole.find(hostgroup_role_id).update(position: idx + 1)
+      end
+    end
+  end
+end

data/db/seeds.d/100_common_parameters.rb

@@ -0,0 +1,7 @@
+CommonParameter.without_auditing do
+  params = [
+    { name: 'ansible_roles_check_mode', key_type: 'boolean', value: false }
+  ]
+
+  params.each { |param| CommonParameter.find_or_create_by(param) }
+end

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

@@ -13,7 +13,25 @@ blueprints = [
         :title => N_('Job Details')
       ]
     }
+  },
+  {
+    :group => N_('Roles'),
+    :name => 'Sync_roles_and_variables_successfully',
+    :message => N_('Import roles and variables has finished successfully'),
+    :level => 'success',
+    :actions => {
+      :links => [
+        :path_method => :ansible_roles_path,
+        :title => N_('Roles')
+      ]
+    }
+  },
+  {
+    :group => N_('Roles'),
+    :name => 'Sync_roles_and_variables_failed',
+    :message => 'DYNAMIC',
+    :level => 'error'
   }
-]
 
+]
 blueprints.each { |blueprint| UINotifications::Seed.new(blueprint).configure }