T2117: Cloud-init updated to 22.1

Merged with 22.1 tag from the upstream Cloud-init repository.

Our modules were slightly modified for compatibility with the new
version.

1 files changed, 41 insertions, 26 deletions

diff --git a/cloudinit/config/cc_spacewalk.py b/cloudinit/config/cc_spacewalk.py
index 95083607..3fa6c388 100644
--- a/cloudinit/config/cc_spacewalk.py
+++ b/cloudinit/config/cc_spacewalk.py
@@ -29,9 +29,8 @@ For more information about spacewalk see: https://fedorahosted.org/spacewalk/
 
 from cloudinit import subp
 
-
-distros = ['redhat', 'fedora']
-required_packages = ['rhn-setup']
+distros = ["redhat", "fedora"]
+required_packages = ["rhn-setup"]
 def_ca_cert_path = "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
 
 
@@ -41,7 +40,7 @@ def is_registered():
     # assume we aren't registered; which is sorta ghetto...
     already_registered = False
     try:
-        subp.subp(['rhn-profile-sync', '--verbose'], capture=False)
+        subp.subp(["rhn-profile-sync", "--verbose"], capture=False)
         already_registered = True
     except subp.ProcessExecutionError as e:
         if e.exit_code != 1:
@@ -49,42 +48,58 @@ def is_registered():
     return already_registered
 
 
-def do_register(server, profile_name,
-                ca_cert_path=def_ca_cert_path,
-                proxy=None, log=None,
-                activation_key=None):
+def do_register(
+    server,
+    profile_name,
+    ca_cert_path=def_ca_cert_path,
+    proxy=None,
+    log=None,
+    activation_key=None,
+):
     if log is not None:
-        log.info("Registering using `rhnreg_ks` profile '%s'"
-                 " into server '%s'", profile_name, server)
-    cmd = ['rhnreg_ks']
-    cmd.extend(['--serverUrl', 'https://%s/XMLRPC' % server])
-    cmd.extend(['--profilename', str(profile_name)])
+        log.info(
+            "Registering using `rhnreg_ks` profile '%s' into server '%s'",
+            profile_name,
+            server,
+        )
+    cmd = ["rhnreg_ks"]
+    cmd.extend(["--serverUrl", "https://%s/XMLRPC" % server])
+    cmd.extend(["--profilename", str(profile_name)])
     if proxy:
         cmd.extend(["--proxy", str(proxy)])
     if ca_cert_path:
-        cmd.extend(['--sslCACert', str(ca_cert_path)])
+        cmd.extend(["--sslCACert", str(ca_cert_path)])
     if activation_key:
-        cmd.extend(['--activationkey', str(activation_key)])
+        cmd.extend(["--activationkey", str(activation_key)])
     subp.subp(cmd, capture=False)
 
 
 def handle(name, cfg, cloud, log, _args):
-    if 'spacewalk' not in cfg:
-        log.debug(("Skipping module named %s,"
-                   " no 'spacewalk' key in configuration"), name)
+    if "spacewalk" not in cfg:
+        log.debug(
+            "Skipping module named %s, no 'spacewalk' key in configuration",
+            name,
+        )
         return
-    cfg = cfg['spacewalk']
-    spacewalk_server = cfg.get('server')
+    cfg = cfg["spacewalk"]
+    spacewalk_server = cfg.get("server")
     if spacewalk_server:
         # Need to have this installed before further things will work.
         cloud.distro.install_packages(required_packages)
         if not is_registered():
-            do_register(spacewalk_server,
-                        cloud.datasource.get_hostname(fqdn=True),
-                        proxy=cfg.get("proxy"), log=log,
-                        activation_key=cfg.get('activation_key'))
+            do_register(
+                spacewalk_server,
+                cloud.datasource.get_hostname(fqdn=True),
+                proxy=cfg.get("proxy"),
+                log=log,
+                activation_key=cfg.get("activation_key"),
+            )
     else:
-        log.debug("Skipping module named %s, 'spacewalk/server' key"
-                  " was not found in configuration", name)
+        log.debug(
+            "Skipping module named %s, 'spacewalk/server' key"
+            " was not found in configuration",
+            name,
+        )
+
 
 # vi: ts=4 expandtab