foreman_ansible 11.1.1 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d240da772a37f88926b90ead02fae80bea4f14e257cff99873c805c7ff171a92
-  data.tar.gz: 00e38d4208388c1893e29f440f1afc6f4988fc31a9c1d9e1107bb337f34e14a2
+  metadata.gz: bf610471f0b7c4357d630471f3f34f4d99f84d91060904ebc7baee85a0a26162
+  data.tar.gz: 1bf0b29be5c77f3942fd0ec3f1e00b22bdb9d4dc04deda4cb119763a25c1e042
 SHA512:
-  metadata.gz: b1af6d0d6eee6c4f7ef48c22d795c6480516c1f8fa80539d64b6c6184b945af1a8a6350cfa963963b486a1b169a907efffa6573528547e1e386d47b819d96967
-  data.tar.gz: 2e8f162c2ec013b1bee7be62f06b77a55b0d22d57e40449e3cdb7312ff3a532fa3bb61a0b083fb7a5421d5ad33a1d7811d749e0ec4c6e95741d36bd49644da46
+  metadata.gz: 16c9980e47104205c17326496bf12c2bbf3913db2c80155395b20f0b35f78e7d94c25ad763778431ad11b25ae894a1c5e4c92a14483efe769012fafcc1dbf084
+  data.tar.gz: cba6767ef45ff810159320b9351e89f9e984234364e9d2206aa72ec172d2dd5878111e2ff7febd058ae6ba9aa3642b31e9aad446997117dd799138699b0c5d1d

data/app/helpers/foreman_ansible/ansible_hostgroups_helper.rb

@@ -4,18 +4,38 @@ module ForemanAnsible
   module AnsibleHostgroupsHelper
     def ansible_hostgroups_actions(hostgroup)
       actions = []
-      play_roles = if hostgroup.all_ansible_roles.empty?
-                     { action: { content: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No roles assigned', class: 'disabled'), options: { class: 'disabled' } }, priority: 31 }
-                   else
-                     { action: display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group')), priority: 31 }
-                   end
+      is_hostgroup_empty = hostgroup.all_ansible_roles.empty? || hostgroup.hosts_count.zero?
 
-      assign_jobs = { action: { content: (link_to _('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la') }, priority: 32 }
+      if User.current.can?(:create_job_invocations)
+        actions << {
+          action: if is_hostgroup_empty
+                    disabled_action_link(_('Run all Ansible roles'))
+                  else
+                    display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group'))
+                  end,
+          priority: 31
+        }
+      end
 
-      actions.push play_roles if User.current.can?(:create_job_invocations)
-      actions.push assign_jobs if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
+      if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
+        actions << {
+          action: if is_hostgroup_empty
+                    disabled_action_link(_('Configure Ansible Job'))
+                  else
+                    link_to(_('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la')
+                  end,
+          priority: 32
+        }
+      end
 
       actions
     end
+
+    def disabled_action_link(text)
+      {
+        content: link_to(text, 'javascript:void(0);', disabled: true, title: _('No roles/hosts assigned'), class: 'disabled'),
+        options: { class: 'disabled' }
+      }
+    end
   end
 end

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

@@ -21,6 +21,21 @@ template_inputs:
   value_type: plain
   resource_type: Katello::ActivationKey
   hidden_value: false
+- name: Data telemetry
+  required: true
+  input_type: user
+  description: "The convert2rhel utility uploads the following data about the system
+    conversion to Red Hat servers for the purpose of the utility usage analysis:<br>\r\n-
+    The conver2rhel command as executed<br>\r\n- The convert2rhel RPM version and
+    GPG signature<br>\r\n- Success or failure status of the conversion<br>\r\n- Conversion
+    start and end timestamps<br>\r\n- Source OS vendor and version<br>\r\n- Target
+    RHEL version<br>\r\n- convert2rhel related environment variables<br>"
+  options: "yes\r\nno"
+  advanced: false
+  value_type: plain
+  resource_type: Katello::ActivationKey
+  default: 'yes'
+  hidden_value: false
 model: JobTemplate
 job_category: Convert 2 RHEL
 provider_type: Ansible
@@ -28,6 +43,10 @@ kind: job_template
 %>
 ---
 - hosts: all
+<%- if input('Data telemetry') != "yes" -%>
+  environment:
+    CONVERT2RHEL_DISABLE_TELEMETRY: 1
+<%- end -%>
   tasks:
     - name: Install convert2rhel
       ansible.builtin.package:
@@ -44,5 +63,6 @@ kind: job_template
       reboot:
         reboot_timeout: 1800
 <%- end -%>
+<%- # This will update system facts in Satellite and link the correct OS of the host %->
     - name: Update system facts
       command: subscription-manager facts --update

data/db/migrate/20221003153000_add_ansible_callback_enabled_to_templates.rb

@@ -4,7 +4,7 @@ class AddAnsibleCallbackEnabledToTemplates < ActiveRecord::Migration[6.0]
   def change
     add_column :templates, :ansible_callback_enabled, :boolean, default: false
     RemoteExecutionFeature.where(label: 'ansible_run_host').each do |rex_feature|
-      Template.find(rex_feature.job_template_id).update(ansible_callback_enabled: true)
+      Template.where(id: rex_feature.job_template_id).update_all(ansible_callback_enabled: true)
     end
   end
 end

data/db/migrate/20230416170000_enable_ansible_callback_for_rex_feature.rb

@@ -0,0 +1,5 @@
+class EnableAnsibleCallbackForRexFeature < ActiveRecord::Migration[6.0]
+  def change
+    Template.where(id: RemoteExecutionFeature.select(:job_template_id).where(label: 'ansible_run_host')).update_all(ansible_callback_enabled: true)
+  end
+end

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 = '11.1.1'
+  VERSION = '11.2.0'
 end

data/test/integration/hostgroup_js_test.rb

@@ -10,21 +10,23 @@ class HostgroupJsTest < IntegrationTestWithJavascript
     FactoryBot.create(:host, :hostgroup_id => hostgroup_with_roles.id)
   end
 
-  test 'hostgroup without roles should have disabled link' do
+  test 'hostgroup without roles should have disabled links' do
     visit hostgroups_path(search: hostgroup.name)
 
     first_row = page.find('table > tbody > tr:nth-child(1)')
     first_row.find('td:nth-child(4) > div > a').click
 
     assert_includes first(:link, 'Run all Ansible roles')[:class], 'disabled'
+    assert_includes first(:link, 'Configure Ansible Job')[:class], 'disabled'
   end
 
-  test 'hostgroup with roles should have clickable link' do
+  test 'hostgroup with roles should have clickable links' do
     visit hostgroups_path(search: hostgroup_with_roles.name)
 
     first_row = page.find('table > tbody > tr:nth-child(1)')
     first_row.find('td:nth-child(4) > div > a').click
 
     assert_not first(:link, 'Run all Ansible roles')[:class].include?('disabled')
+    assert_not first(:link, 'Configure Ansible Job')[:class].include?('disabled')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 11.1.1
+  version: 11.2.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -225,6 +225,7 @@ files:
 - db/migrate/20210818083407_fix_ansible_setting_category_to_dsl.rb
 - db/migrate/20221003153000_add_ansible_callback_enabled_to_templates.rb
 - db/migrate/20221031114720_rename_capsule_upgrade_playbook.rb
+- db/migrate/20230416170000_enable_ansible_callback_for_rex_feature.rb
 - db/seeds.d/100_common_parameters.rb
 - db/seeds.d/62_ansible_proxy_feature.rb
 - db/seeds.d/75_job_templates.rb
@@ -237,81 +238,45 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_ansible.mo
-- locale/ca/foreman_ansible.edit.po
 - locale/ca/foreman_ansible.po
-- locale/ca/foreman_ansible.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_ansible.mo
-- locale/cs_CZ/foreman_ansible.edit.po
 - locale/cs_CZ/foreman_ansible.po
-- locale/cs_CZ/foreman_ansible.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_ansible.mo
-- locale/de/foreman_ansible.edit.po
 - locale/de/foreman_ansible.po
-- locale/de/foreman_ansible.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_ansible.mo
-- locale/en/foreman_ansible.edit.po
 - locale/en/foreman_ansible.po
-- locale/en/foreman_ansible.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_ansible.mo
-- locale/en_GB/foreman_ansible.edit.po
 - locale/en_GB/foreman_ansible.po
-- locale/en_GB/foreman_ansible.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_ansible.mo
-- locale/es/foreman_ansible.edit.po
 - locale/es/foreman_ansible.po
-- locale/es/foreman_ansible.po.time_stamp
 - locale/foreman_ansible.pot
 - locale/fr/LC_MESSAGES/foreman_ansible.mo
-- locale/fr/foreman_ansible.edit.po
 - locale/fr/foreman_ansible.po
-- locale/fr/foreman_ansible.po.time_stamp
 - locale/gemspec.rb
 - locale/gl/LC_MESSAGES/foreman_ansible.mo
-- locale/gl/foreman_ansible.edit.po
 - locale/gl/foreman_ansible.po
-- locale/gl/foreman_ansible.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_ansible.mo
-- locale/it/foreman_ansible.edit.po
 - locale/it/foreman_ansible.po
-- locale/it/foreman_ansible.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_ansible.mo
-- locale/ja/foreman_ansible.edit.po
 - locale/ja/foreman_ansible.po
-- locale/ja/foreman_ansible.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_ansible.mo
 - locale/ka/foreman_ansible.po
 - locale/ko/LC_MESSAGES/foreman_ansible.mo
-- locale/ko/foreman_ansible.edit.po
 - locale/ko/foreman_ansible.po
-- locale/ko/foreman_ansible.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/foreman_ansible.mo
-- locale/nl_NL/foreman_ansible.edit.po
 - locale/nl_NL/foreman_ansible.po
-- locale/nl_NL/foreman_ansible.po.time_stamp
 - locale/pl/LC_MESSAGES/foreman_ansible.mo
-- locale/pl/foreman_ansible.edit.po
 - locale/pl/foreman_ansible.po
-- locale/pl/foreman_ansible.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_ansible.mo
-- locale/pt_BR/foreman_ansible.edit.po
 - locale/pt_BR/foreman_ansible.po
-- locale/pt_BR/foreman_ansible.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_ansible.mo
-- locale/ru/foreman_ansible.edit.po
 - locale/ru/foreman_ansible.po
-- locale/ru/foreman_ansible.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_ansible.mo
-- locale/sv_SE/foreman_ansible.edit.po
 - locale/sv_SE/foreman_ansible.po
-- locale/sv_SE/foreman_ansible.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/foreman_ansible.mo
-- locale/zh_CN/foreman_ansible.edit.po
 - locale/zh_CN/foreman_ansible.po
-- locale/zh_CN/foreman_ansible.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_ansible.mo
-- locale/zh_TW/foreman_ansible.edit.po
 - locale/zh_TW/foreman_ansible.po
-- locale/zh_TW/foreman_ansible.po.time_stamp
 - package.json
 - test/factories/ansible_proxy.rb
 - test/factories/ansible_roles.rb
@@ -384,7 +349,6 @@ files:
 - 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/PreviousJobsTable.js.orig
 - 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
@@ -505,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -520,23 +484,31 @@ test_files:
 - test/fixtures/sample_playbooks.json
 - test/fixtures/report.json
 - test/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/api/v2/ansible_playbooks_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/api/v2/ansible_inventories_controller_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/ansible_variables_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/graphql/queries/host_ansible_roles_query_test.rb
+- test/test_plugin_helper.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/concerns/config_reports_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
+- test/unit/ignore_roles_test.rb
+- test/unit/import_playbooks_test.rb
+- test/unit/import_roles_and_variables.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
@@ -546,13 +518,5 @@ test_files:
 - test/unit/services/override_resolver_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/ignore_roles_test.rb
-- test/unit/import_playbooks_test.rb
-- test/unit/import_roles_and_variables.rb
 - test/unit/ansible_provider_test.rb
-- test/test_plugin_helper.rb
 - test/integration/hostgroup_js_test.rb