foreman_ansible 13.0.3 → 13.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f523c6510ef86f864e87e6861cacd4e3d60aa051775c7a2c8fcc358f9c5dd3
-  data.tar.gz: 4b3286903ba586efe5cded3fc51d4e62ea4379531a9880eda70b0e16b220fda8
+  metadata.gz: 5c4af68ee17d90327c926378e19f7c6fc1cc7141c1379074ba6dca91cb6cc0ff
+  data.tar.gz: 0b1fbfd87e48bcbd01fcef781388992bcf03ca274e3187011b02adf2cf379715
 SHA512:
-  metadata.gz: 222813ad1bafba9d441710ecc46c0c2a046441235d88872c68c869c786798761657ff0461bc416f392c4757cf7142433abc0522bea4d43b770e49fe71eba50e2
-  data.tar.gz: b975529508ecec0dca43053d04145519aa104a2233c5420cc55bce56247b79588a9328bda0571b6216fb5954cef9696889c0f52db1e1f791581ca717bada89e6
+  metadata.gz: 645645d8d3a3be25011a1cf87ce63d3ee58b3016710c9dec5a5635fd4abf827f8da1a85118430feb4e59ac0fffd975be62c651a0c1657d256d27a57da7931887
+  data.tar.gz: 98c523e75f9e5c5bfbee9de973d8dad7281a1d0af614e86ffefb1f9f77bc7305e27778ada8476dbfa55d7d040b7829a1941811bbf84db5db8cca26b7d5fbe917

data/app/services/foreman_ansible/inventory_creator.rb

@@ -97,7 +97,7 @@ module ForemanAnsible
 
     def remote_execution_options(host)
       params = {
-        'ansible_user' => host_setting(host, 'remote_execution_ssh_user'),
+        'ansible_user' => @template_invocation&.job_invocation&.ssh_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_ssh_private_key(host),
         'ansible_port' => host_setting(host, 'remote_execution_ssh_port'),

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

@@ -19,7 +19,6 @@ template_inputs:
   options: "yes\r\nno"
   advanced: false
   value_type: plain
-  resource_type: Katello::ActivationKey
   hidden_value: false
 - name: Data telemetry
   required: true
@@ -52,12 +51,27 @@ kind: job_template
       ansible.builtin.package:
         name: convert2rhel
         state: present
+
+    - name: Gather package facts
+      package_facts:
+        manager: auto
+
+    - name: Set fact for package version
+      set_fact:
+        convert2rhel_version: "{{ ansible_facts.packages['convert2rhel'][0].version }}"
+      when: "'convert2rhel' in ansible_facts.packages"
+      no_log: true
+
     - 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
+      when:
+        - "convert2rhel_version is version('2.0.0', '<')"
+
     - name: Start convert2rhel
-      command: convert2rhel -y --activationkey "<%= input_resource('Activation Key').name %>" --org "<%= @host.organization.label %>" --keep-rhsm
+      command: convert2rhel -y --activationkey "<%= input_resource('Activation Key').name %>" --org "<%= @host.organization.label %>"
+
 <%- if input('Restart') == "yes" -%>
     - name: Reboot the machine
       reboot:

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 = '13.0.3'
+  VERSION = '13.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 13.0.3
+  version: 13.0.5
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -47,7 +47,7 @@ dependencies:
         version: '9.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '9.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -485,7 +485,7 @@ homepage: https://github.com/theforeman/foreman_ansible
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -500,8 +500,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
@@ -511,23 +511,26 @@ test_files:
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
 - test/fixtures/playbooks_example_output.json
+- test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - 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_inventories_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/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/integration/hostgroup_js_test.rb
+- test/test_plugin_helper.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/ansible_role_test.rb
 - test/unit/ansible_variable_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
@@ -548,6 +551,3 @@ 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_provider_test.rb
-- test/integration/hostgroup_js_test.rb
-- test/test_plugin_helper.rb