Cloud-init: T2117: Updated to 20.1

  - Merge 20.1 version from the Canonical repository
  - Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
  - Adapted cc_vyos module to new Cloud-init version
  - Changed Jenkinsfile to use build scripts, provided by upstream

1 files changed, 6 insertions, 6 deletions

diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py
index aff4010e..3d2ded3d 100644
--- a/cloudinit/config/cc_keys_to_console.py
+++ b/cloudinit/config/cc_keys_to_console.py
@@ -9,10 +9,10 @@
 """
 Keys to Console
 ---------------
-**Summary:** control which ssh keys may be written to console
+**Summary:** control which SSH keys may be written to console
 
-For security reasons it may be desirable not to write ssh fingerprints and keys
-to the console. To avoid the fingerprint of types of ssh keys being written to
+For security reasons it may be desirable not to write SSH fingerprints and keys
+to the console. To avoid the fingerprint of types of SSH keys being written to
 console the ``ssh_fp_console_blacklist`` config key can be used. By default all
 types of keys will have their fingerprints written to console. To avoid keys
 of a key type being written to console the ``ssh_key_console_blacklist`` config
@@ -52,8 +52,8 @@ def _get_helper_tool_path(distro):
 def handle(name, cfg, cloud, log, _args):
     helper_path = _get_helper_tool_path(cloud.distro)
     if not os.path.exists(helper_path):
-        log.warn(("Unable to activate module %s,"
-                  " helper tool not found at %s"), name, helper_path)
+        log.warning(("Unable to activate module %s,"
+                     " helper tool not found at %s"), name, helper_path)
         return
 
     fp_blacklist = util.get_cfg_option_list(cfg,
@@ -68,7 +68,7 @@ def handle(name, cfg, cloud, log, _args):
         util.multi_log("%s\n" % (stdout.strip()),
                        stderr=False, console=True)
     except Exception:
-        log.warn("Writing keys to the system console failed!")
+        log.warning("Writing keys to the system console failed!")
         raise
 
 # vi: ts=4 expandtab