From 25712b40dfbe197c1ad8bdc783a2235e3c87c7de Mon Sep 17 00:00:00 2001 From: harlowja Date: Sun, 1 Jul 2012 12:08:08 -0700 Subject: 1. Rename util functions to is_true and is_false 2. Move the config loading functions to where they are used (in stages) 3. Adjust cc_set_passwords to use the is_true and is_false renamed functions 4. Adjust the init stage to have a _read_base_config function used to load the base 'initial' configuration from the following locations a. Kernel cmdline b. Conf.d location (+ the cloud.cfg location) c. Built-in configuration --- cloudinit/config/cc_set_passwords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit/config') diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index 5b72224b..ab266741 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -96,9 +96,9 @@ def handle(_name, cfg, cloud, log, args): pw_auth = None if 'ssh_pwauth' in cfg: change_pwauth = True - if util.is_true_str(cfg['ssh_pwauth']): + if util.is_true(cfg['ssh_pwauth']): pw_auth = 'yes' - if util.is_false_str(cfg['ssh_pwauth']): + if util.is_false(cfg['ssh_pwauth']): pw_auth = 'no' if change_pwauth: -- cgit v1.2.3