Merge pull request #4 from zdc/T2117

Cloud-init: T2117: Updated to 20.1 version

1 files changed, 14 insertions, 13 deletions

diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index 46abedd1..01d61fa1 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -51,6 +51,7 @@ file).
 
     chef:
       client_key:
+      encrypted_data_bag_secret:
       environment:
       file_backup_path:
       file_cache_path:
@@ -78,8 +79,6 @@ from cloudinit import templater
 from cloudinit import url_helper
 from cloudinit import util
 
-import six
-
 RUBY_VERSION_DEFAULT = "1.8"
 
 CHEF_DIRS = tuple([
@@ -114,6 +113,7 @@ CHEF_RB_TPL_DEFAULTS = {
     'file_backup_path': "/var/backups/chef",
     'pid_file': "/var/run/chef/client.pid",
     'show_time': True,
+    'encrypted_data_bag_secret': None,
 }
 CHEF_RB_TPL_BOOL_KEYS = frozenset(['show_time'])
 CHEF_RB_TPL_PATH_KEYS = frozenset([
@@ -124,6 +124,7 @@ CHEF_RB_TPL_PATH_KEYS = frozenset([
     'json_attribs',
     'file_cache_path',
     'pid_file',
+    'encrypted_data_bag_secret',
 ])
 CHEF_RB_TPL_KEYS = list(CHEF_RB_TPL_DEFAULTS.keys())
 CHEF_RB_TPL_KEYS.extend(CHEF_RB_TPL_BOOL_KEYS)
@@ -193,7 +194,7 @@ def handle(name, cfg, cloud, log, _args):
     # If there isn't a chef key in the configuration don't do anything
     if 'chef' not in cfg:
         log.debug(("Skipping module named %s,"
-                  " no 'chef' key in configuration"), name)
+                   " no 'chef' key in configuration"), name)
         return
     chef_cfg = cfg['chef']
 
@@ -212,9 +213,9 @@ def handle(name, cfg, cloud, log, _args):
         if vcert != "system":
             util.write_file(vkey_path, vcert)
         elif not os.path.isfile(vkey_path):
-            log.warn("chef validation_cert provided as 'system', but "
-                     "validation_key path '%s' does not exist.",
-                     vkey_path)
+            log.warning("chef validation_cert provided as 'system', but "
+                        "validation_key path '%s' does not exist.",
+                        vkey_path)
 
     # Create the chef config from template
     template_fn = cloud.get_template_filename('chef_client.rb')
@@ -231,8 +232,8 @@ def handle(name, cfg, cloud, log, _args):
         util.ensure_dirs(param_paths)
         templater.render_to_file(template_fn, CHEF_RB_PATH, params)
     else:
-        log.warn("No template found, not rendering to %s",
-                 CHEF_RB_PATH)
+        log.warning("No template found, not rendering to %s",
+                    CHEF_RB_PATH)
 
     # Set the firstboot json
     fb_filename = util.get_cfg_option_str(chef_cfg, 'firstboot_path',
@@ -270,12 +271,12 @@ def run_chef(chef_cfg, log):
         cmd_args = chef_cfg['exec_arguments']
         if isinstance(cmd_args, (list, tuple)):
             cmd.extend(cmd_args)
-        elif isinstance(cmd_args, six.string_types):
+        elif isinstance(cmd_args, str):
             cmd.append(cmd_args)
         else:
-            log.warn("Unknown type %s provided for chef"
-                     " 'exec_arguments' expected list, tuple,"
-                     " or string", type(cmd_args))
+            log.warning("Unknown type %s provided for chef"
+                        " 'exec_arguments' expected list, tuple,"
+                        " or string", type(cmd_args))
             cmd.extend(CHEF_EXEC_DEF_ARGS)
     else:
         cmd.extend(CHEF_EXEC_DEF_ARGS)
@@ -331,7 +332,7 @@ def install_chef(cloud, chef_cfg, log):
             retries=util.get_cfg_option_int(chef_cfg, "omnibus_url_retries"),
             omnibus_version=omnibus_version)
     else:
-        log.warn("Unknown chef install type '%s'", install_type)
+        log.warning("Unknown chef install type '%s'", install_type)
         run = False
     return run