fix: use the right systemd service for remediations in EL 10+

tasks/insights-client.yml

@@ -173,13 +173,13 @@
       systemd:
         enabled: true
         state: started
-        name: rhcd
+        name: "{{ __rhc_yggdrasil_systemd_service }}"
 
 - name: Disable remediation
   systemd:
     enabled: false
     state: stopped
-    name: rhcd
+    name: "{{ __rhc_yggdrasil_systemd_service }}"
   when:
     - rhc_insights.remediation | d("present") == "absent"
     - '"rhc" in ansible_facts.packages'

tests/tests_insights_remediation.yml

@@ -25,6 +25,7 @@
         - name: Register insights and enable remediation
           include_role:
             name: linux-system-roles.rhc
+            public: true
           vars:
             rhc_auth:
               login:
@@ -41,14 +42,18 @@
               insecure: "{{ lsr_rhc_test_data.candlepin_insecure }}"
             rhc_baseurl: "{{ lsr_rhc_test_data.baseurl | d(omit) }}"
 
+        - name: Set the fact for the systemd service
+          set_fact:
+            yggdrasil_systemd_service: "{{ __rhc_yggdrasil_systemd_service + '.service' }}"
+
         - name: Get service_facts
           service_facts:
 
         - name: Check remediation is enabled
           assert:
             that:
-              - "'rhcd.service' in ansible_facts.services"
-              - ansible_facts.services['rhcd.service'].status == 'enabled'
+              - yggdrasil_systemd_service in ansible_facts.services
+              - ansible_facts.services[yggdrasil_systemd_service].status == 'enabled'
 
         - name: Disable remediation
           include_role:
@@ -63,8 +68,8 @@
         - name: Check remediation is disabled
           assert:
             that:
-              - "'rhcd.service' in ansible_facts.services"
-              - ansible_facts.services['rhcd.service'].status == 'disabled'
+              - yggdrasil_systemd_service in ansible_facts.services
+              - ansible_facts.services[yggdrasil_systemd_service].status == 'disabled'
 
         - name: Disable remediation (noop)
           include_role:

vars/main.yml

@@ -25,6 +25,13 @@ __rhc_insights_conf: "/etc/insights-client/insights-client.conf"
 
 __rhc_insights_tags: "/etc/insights-client/tags.yaml"
 
+# name of the rhcd/yggdrasil systemd service that maintains the mqtt connection
+# to Insights, used for remediations; starting from EL 10 the service is the
+# upstream one, and no more the downstream-branded one
+__rhc_yggdrasil_systemd_service: "{{ 'yggdrasil'
+  if (ansible_distribution_major_version | int >= 10)
+  else 'rhcd' }}"
+
 # BEGIN - DO NOT EDIT THIS BLOCK - rh distros variables
 # Ansible distribution identifiers that the role treats like RHEL
 __rhc_rh_distros: