summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_chef.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2014-10-11 19:39:36 -0700
committerJoshua Harlow <harlowja@gmail.com>2014-10-11 19:39:36 -0700
commitdb6cee3fe1c6033af8ae66f76c7c81a5af2d9c5a (patch)
tree8f48a61fdb8d93f7eb081acee96357e374e7d497 /cloudinit/config/cc_chef.py
parent32bb2f37593482b179c8627bb254d50121a8be01 (diff)
downloadvyos-cloud-init-db6cee3fe1c6033af8ae66f76c7c81a5af2d9c5a.tar.gz
vyos-cloud-init-db6cee3fe1c6033af8ae66f76c7c81a5af2d9c5a.zip
Follow the same constant variable naming scheme for the path tpl keys
Diffstat (limited to 'cloudinit/config/cc_chef.py')
-rw-r--r--cloudinit/config/cc_chef.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index 66187659..e9a37652 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -58,7 +58,7 @@ CHEF_RB_TPL_DEFAULTS = {
'show_time': True,
}
CHEF_RB_TPL_BOOL_KEYS = frozenset(['show_time'])
-CHEF_RB_PATH_KEYS = frozenset([
+CHEF_RB_TPL_PATH_KEYS = frozenset([
'log_location',
'validation_key',
'client_key',
@@ -69,7 +69,7 @@ CHEF_RB_PATH_KEYS = frozenset([
])
CHEF_RB_TPL_KEYS = list(CHEF_RB_TPL_DEFAULTS.keys())
CHEF_RB_TPL_KEYS.extend(CHEF_RB_TPL_BOOL_KEYS)
-CHEF_RB_TPL_KEYS.extend(CHEF_RB_PATH_KEYS)
+CHEF_RB_TPL_KEYS.extend(CHEF_RB_TPL_PATH_KEYS)
CHEF_RB_TPL_KEYS.extend([
'server_url',
'node_name',
@@ -153,7 +153,7 @@ def handle(name, cfg, cloud, log, _args):
params = get_template_params(iid, chef_cfg, log)
param_paths = set()
for (k, v) in params.items():
- if k in CHEF_RB_PATH_KEYS and v:
+ if k in CHEF_RB_TPL_PATH_KEYS and v:
param_paths.add(os.path.dirname(v))
util.ensure_dirs(param_paths)
templater.render_to_file(template_fn, CHEF_RB_PATH, params)