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, 7 insertions, 7 deletions

diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py
index 98b0e665..7ac1c8cf 100755
--- a/cloudinit/config/cc_ssh_authkey_fingerprints.py
+++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py
@@ -7,11 +7,11 @@
 """
 SSH Authkey Fingerprints
 ------------------------
-**Summary:** log fingerprints of user ssh keys
+**Summary:** log fingerprints of user SSH keys
 
 Write fingerprints of authorized keys for each user to log. This is enabled by
 default, but can be disabled using ``no_ssh_fingerprints``. The hash type for
-the keys can be specified, but defaults to ``md5``.
+the keys can be specified, but defaults to ``sha256``.
 
 **Internal name:** `` cc_ssh_authkey_fingerprints``
 
@@ -42,7 +42,7 @@ def _split_hash(bin_hash):
     return split_up
 
 
-def _gen_fingerprint(b64_text, hash_meth='md5'):
+def _gen_fingerprint(b64_text, hash_meth='sha256'):
     if not b64_text:
         return ''
     # TBD(harlowja): Maybe we should feed this into 'ssh -lf'?
@@ -65,10 +65,10 @@ def _is_printable_key(entry):
     return False
 
 
-def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5',
+def _pprint_key_entries(user, key_fn, key_entries, hash_meth='sha256',
                         prefix='ci-info: '):
     if not key_entries:
-        message = ("%sno authorized ssh keys fingerprints found for user %s.\n"
+        message = ("%sno authorized SSH keys fingerprints found for user %s.\n"
                    % (prefix, user))
         util.multi_log(message)
         return
@@ -98,10 +98,10 @@ def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5',
 def handle(name, cfg, cloud, log, _args):
     if util.is_true(cfg.get('no_ssh_fingerprints', False)):
         log.debug(("Skipping module named %s, "
-                   "logging of ssh fingerprints disabled"), name)
+                   "logging of SSH fingerprints disabled"), name)
         return
 
-    hash_meth = util.get_cfg_option_str(cfg, "authkey_hash", "md5")
+    hash_meth = util.get_cfg_option_str(cfg, "authkey_hash", "sha256")
     (users, _groups) = ug_util.normalize_users_groups(cfg, cloud.distro)
     for (user_name, _cfg) in users.items():
         (key_fn, key_entries) = ssh_util.extract_authorized_keys(user_name)