foreman_ansible 13.0.4 → 13.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7132e432366b88fff7c9b385eb6708aeb04f35d8c52098af9c673d64ab049219
-  data.tar.gz: 3761ecc72d5366c6db9260a521f72894b31c335be21800324fd45df09068a503
+  metadata.gz: 5c4af68ee17d90327c926378e19f7c6fc1cc7141c1379074ba6dca91cb6cc0ff
+  data.tar.gz: 0b1fbfd87e48bcbd01fcef781388992bcf03ca274e3187011b02adf2cf379715
 SHA512:
-  metadata.gz: 975d0def83217d4dfdb7f53f4da0cede7244f666dba088f63abde4e2f143e88dafe08297f3f2c42c22a15204bd94eac8c6238720fab11c5c1e903324f07e0876
-  data.tar.gz: 57b5f9d120e4655a28fb5b5ba3a3ef35de5d4a3a9e1462567a04c38da9d19aeb2e65f3570ba5c8643e78dcfb64a6dbf1646375e949a0102b611eb5d3cc2a8ae6
+  metadata.gz: 645645d8d3a3be25011a1cf87ce63d3ee58b3016710c9dec5a5635fd4abf827f8da1a85118430feb4e59ac0fffd975be62c651a0c1657d256d27a57da7931887
+  data.tar.gz: 98c523e75f9e5c5bfbee9de973d8dad7281a1d0af614e86ffefb1f9f77bc7305e27778ada8476dbfa55d7d040b7829a1941811bbf84db5db8cca26b7d5fbe917

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.4'
+  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.4
+  version: 13.0.5
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -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.2.3
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files: