foreman_ansible 6.0.1 → 6.3.0

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,6 +1,11 @@
 <%= 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>
@@ -12,12 +17,14 @@
   </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><%= ansible_module_name(log) %></td>
+          <td><%= ansible_module_args(log) %></td>
+          <td><%= ansible_module_message(log) %></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_-_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 }

data/lib/foreman_ansible/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'deface'
+require 'acts_as_list'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
 require 'foreman_ansible_core' if Rails.env.test?

data/lib/foreman_ansible/register.rb

@@ -25,7 +25,7 @@ Foreman::Plugin.register :foreman_ansible do
                :resource_type => 'AnsibleRole'
     permission :import_ansible_roles,
                { :ansible_roles => [:import, :confirm_import],
-                 :'api/v2/ansible_roles' => [:import] },
+                 :'api/v2/ansible_roles' => [:import, :sync] },
                :resource_type => 'AnsibleRole'
     permission :view_ansible_variables,
                {
@@ -91,10 +91,10 @@ Foreman::Plugin.register :foreman_ansible do
   extend_template_helpers ForemanAnsible::RendererMethods
   allowed_template_helpers :insights_remediation
 
-  role_assignment_params = { :ansible_role_ids => [],
-                             :ansible_roles => [] }
-  parameter_filter Host::Managed, role_assignment_params
-  parameter_filter Hostgroup, role_assignment_params
+  base_role_assignment_params = { :ansible_role_ids => [],
+                                  :ansible_roles => [] }
+  parameter_filter Host::Managed, base_role_assignment_params.merge(:host_ansible_roles_attributes => {})
+  parameter_filter Hostgroup, base_role_assignment_params.merge(:hostgroup_ansible_roles_attributes => {})
 
   divider :top_menu, :caption => N_('Ansible'), :parent => :configure_menu
   menu :top_menu, :ansible_roles,

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 = '6.0.1'
+  VERSION = '6.3.0'
 end

data/locale/ca/foreman_ansible.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2019\n"

data/locale/cs_CZ/foreman_ansible.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2020\n"

data/locale/de/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/en/foreman_ansible.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-08-20 08:54+0100\n"
 "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"

data/locale/en_GB/foreman_ansible.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2019\n"

data/locale/es/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/fr/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/gl/foreman_ansible.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Carmela Rubiños <carmela.rubinos@gmail.com>, 2019\n"

data/locale/it/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/ja/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"