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

diff --git a/cloudinit/config/cc_power_state_change.py b/cloudinit/config/cc_power_state_change.py
index 50b37470..3e81a3c7 100644
--- a/cloudinit/config/cc_power_state_change.py
+++ b/cloudinit/config/cc_power_state_change.py
@@ -49,16 +49,15 @@ key returns 0.
         condition: <true/false/command>
 """
 
-from cloudinit.settings import PER_INSTANCE
-from cloudinit import util
-
 import errno
 import os
 import re
-import six
 import subprocess
 import time
 
+from cloudinit.settings import PER_INSTANCE
+from cloudinit import util
+
 frequency = PER_INSTANCE
 
 EXIT_FAIL = 254
@@ -103,24 +102,23 @@ def check_condition(cond, log=None):
             return False
         else:
             if log:
-                log.warn(pre + "unexpected exit %s. " % ret +
-                         "do not apply change.")
+                log.warning(pre + "unexpected exit %s. " % ret +
+                            "do not apply change.")
             return False
     except Exception as e:
         if log:
-            log.warn(pre + "Unexpected error: %s" % e)
+            log.warning(pre + "Unexpected error: %s" % e)
         return False
 
 
 def handle(_name, cfg, _cloud, log, _args):
-
     try:
         (args, timeout, condition) = load_power_state(cfg)
         if args is None:
             log.debug("no power_state provided. doing nothing")
             return
     except Exception as e:
-        log.warn("%s Not performing power state change!" % str(e))
+        log.warning("%s Not performing power state change!" % str(e))
         return
 
     if condition is False:
@@ -131,7 +129,7 @@ def handle(_name, cfg, _cloud, log, _args):
 
     cmdline = givecmdline(mypid)
     if not cmdline:
-        log.warn("power_state: failed to get cmdline of current process")
+        log.warning("power_state: failed to get cmdline of current process")
         return
 
     devnull_fp = open(os.devnull, "w")
@@ -184,7 +182,7 @@ def load_power_state(cfg):
                          pstate['timeout'])
 
     condition = pstate.get("condition", True)
-    if not isinstance(condition, six.string_types + (list, bool)):
+    if not isinstance(condition, (str, list, bool)):
         raise TypeError("condition type %s invalid. must be list, bool, str")
     return (args, timeout, condition)
 
@@ -214,7 +212,7 @@ def run_after_pid_gone(pid, pidcmdline, timeout, log, condition, func, args):
 
     def fatal(msg):
         if log:
-            log.warn(msg)
+            log.warning(msg)
         doexit(EXIT_FAIL)
 
     known_errnos = (errno.ENOENT, errno.ESRCH)