diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2012-07-01 12:08:08 -0700 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2012-07-01 12:08:08 -0700 |
| commit | 25712b40dfbe197c1ad8bdc783a2235e3c87c7de (patch) | |
| tree | e15d495971cbf3a5c89c3106050dd0df5cb02da3 /cloudinit/config/cc_set_passwords.py | |
| parent | 342ffe553574c7662d143d3da76f8f4fb6587983 (diff) | |
| download | vyos-cloud-init-25712b40dfbe197c1ad8bdc783a2235e3c87c7de.tar.gz vyos-cloud-init-25712b40dfbe197c1ad8bdc783a2235e3c87c7de.zip | |
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
Diffstat (limited to 'cloudinit/config/cc_set_passwords.py')
| -rw-r--r-- | cloudinit/config/cc_set_passwords.py | 4 |
1 files changed, 2 insertions, 2 deletions
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: |