split checking cl license and copying files to container

Intead of checking cl license and at the same time providing
TargetUserSpacePreupgradeTasks in on actor, split this logic into two

Also stop producing TargetUserSpaceUpgradeTasks as requirements will
be already fulfilled with TargetUserSpacePreupgradeTasks execution.

Author: Monstrofil

repos/system_upgrade/cloudlinux/actors/checkcllicense/actor.py

@@ -13,24 +13,6 @@
 
 import os
 
-RHN_CONFIG_DIR = '/etc/sysconfig/rhn'
-REQUIRED_PKGS = ['dnf-plugin-spacewalk', 'rhn-client-tools']
-
-
-def rhn_to_target_userspace():
-    """
-    Produce messages to copy RHN configuration files and packages to the target userspace
-    """
-    files_to_copy = []
-    for dirpath, _, filenames in os.walk(RHN_CONFIG_DIR):
-        for filename in filenames:
-            src_path = os.path.join(dirpath, filename)
-            if os.path.isfile(src_path):
-                files_to_copy.append(CopyFile(src=src_path))
-
-    api.produce(TargetUserSpacePreupgradeTasks(install_rpms=REQUIRED_PKGS, copy_files=files_to_copy))
-    api.produce(TargetUserSpaceUpgradeTasks(install_rpms=REQUIRED_PKGS, copy_files=files_to_copy))
-
 
 class CheckClLicense(Actor):
     """
@@ -39,17 +21,12 @@ class CheckClLicense(Actor):
 
     name = 'check_cl_license'
     consumes = ()
-    produces = (Report, TargetUserSpacePreupgradeTasks, TargetUserSpaceUpgradeTasks)
+    produces = (Report,)
     tags = (ChecksPhaseTag, IPUWorkflowTag)
 
     system_id_path = '/etc/sysconfig/rhn/systemid'
     rhn_check_bin = '/usr/sbin/rhn_check'
 
-    # # Copy RHN data independent from RHSM config
-    # if os.path.isdir('/etc/sysconfig/rhn'):
-    #     run(['rm', '-rf', os.path.join(target_etc, 'sysconfig/rhn')])
-    #     context.copytree_from('/etc/sysconfig/rhn', os.path.join(target_etc, 'sysconfig/rhn'))
-
     @run_on_cloudlinux
     def process(self):
         res = None
@@ -69,5 +46,3 @@ def process(self):
                 reporting.Groups([reporting.Groups.INHIBITOR]),
                 reporting.Remediation(hint=remediation),
             ])
-        else:
-            rhn_to_target_userspace()

repos/system_upgrade/cloudlinux/actors/copycllicense/actor.py

@@ -0,0 +1,44 @@
+import os
+from leapp.actors import Actor
+from leapp.reporting import Report
+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag
+from leapp.libraries.common.cllaunch import run_on_cloudlinux
+from leapp.libraries.stdlib import api
+from leapp.models import (
+    TargetUserSpacePreupgradeTasks,
+    CopyFile
+)
+
+
+RHN_CONFIG_DIR = '/etc/sysconfig/rhn'
+REQUIRED_PKGS = ['dnf-plugin-spacewalk', 'rhn-client-tools']
+
+
+class CopyClLicense(Actor):
+    """
+    Produce task to copy CloudLinux license files to target system.
+    """
+
+    name = 'copy_rhn_client_tools_config'
+    consumes = ()
+    produces = (Report, TargetUserSpacePreupgradeTasks)
+    tags = (ChecksPhaseTag, IPUWorkflowTag)
+
+    @run_on_cloudlinux
+    def process(self):
+        """
+        Produce artifacts to copy RHN configuration files
+        and install packages to the target userspace,
+        including up2date and systemid.
+        """
+        files_to_copy = []
+        for dirpath, _, filenames in os.walk(RHN_CONFIG_DIR):
+            for filename in filenames:
+                src_path = os.path.join(dirpath, filename)
+                if os.path.isfile(src_path):
+                    files_to_copy.append(CopyFile(src=src_path))
+
+        api.produce(TargetUserSpacePreupgradeTasks(
+            install_rpms=REQUIRED_PKGS,
+            copy_files=files_to_copy
+        ))