foreman_ansible 13.0.4 → 13.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7132e432366b88fff7c9b385eb6708aeb04f35d8c52098af9c673d64ab049219
-  data.tar.gz: 3761ecc72d5366c6db9260a521f72894b31c335be21800324fd45df09068a503
+  metadata.gz: 78a598c4115838d6d1c9894d431755931e6ae6741d688031215b254d5f1c80be
+  data.tar.gz: fbe12bcb0d253149468c7d89820780768c2cdfd843047eda5a13f9845a6a6348
 SHA512:
-  metadata.gz: 975d0def83217d4dfdb7f53f4da0cede7244f666dba088f63abde4e2f143e88dafe08297f3f2c42c22a15204bd94eac8c6238720fab11c5c1e903324f07e0876
-  data.tar.gz: 57b5f9d120e4655a28fb5b5ba3a3ef35de5d4a3a9e1462567a04c38da9d19aeb2e65f3570ba5c8643e78dcfb64a6dbf1646375e949a0102b611eb5d3cc2a8ae6
+  metadata.gz: 46ebd9739a430b8d173c4311b4535ca1f32fa05dbb41bcb4e65ee9d538b79445cd545646c9db2804149a4b73aa7d720c817871990e115a332ca16b2c18da90d8
+  data.tar.gz: 847832cea55007df47f64baaeecc9965e0d6ad2df1935a95c468a785061bdf2cf4f993233a3b1abd4d431d72b8bcb7c4e2c24c75105b336fddf8b5fca1c3e0ef

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

@@ -19,22 +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
-  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 convert2rhel 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
@@ -43,21 +27,34 @@ kind: job_template
 %>
 ---
 - hosts: all
-<%- if input('Data telemetry') != "yes" -%>
   environment:
-    CONVERT2RHEL_DISABLE_TELEMETRY: 1
-<%- end -%>
+    CONVERT2RHEL_THROUGH_FOREMAN: 1
   tasks:
     - name: Install convert2rhel
       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.6'
 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.6
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -500,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)