diff options
| author | Scott Moser <smoser@brickies.net> | 2016-10-25 17:06:18 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-10-25 17:06:18 -0400 |
| commit | f294110e5c8b121f8d8dcb48b0845a419ba13544 (patch) | |
| tree | 9f5adaa598f5e943310075aa3255169db14fad9f /cloudinit/config/cc_ssh.py | |
| parent | 1a2086302c3a62277b272bd004e34eb5d264c2fe (diff) | |
| parent | 29348af1c889931e8973f8fc8cb090c063316f7a (diff) | |
| download | vyos-cloud-init-f294110e5c8b121f8d8dcb48b0845a419ba13544.tar.gz vyos-cloud-init-f294110e5c8b121f8d8dcb48b0845a419ba13544.zip | |
merge from master at 0.7.8-27-g29348af
Diffstat (limited to 'cloudinit/config/cc_ssh.py')
| -rwxr-xr-x[-rw-r--r--] | cloudinit/config/cc_ssh.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py index 6138fb53..576fa58a 100644..100755 --- a/cloudinit/config/cc_ssh.py +++ b/cloudinit/config/cc_ssh.py @@ -109,11 +109,7 @@ import glob import os import sys -# Ensure this is aliased to a name not 'distros' -# since the module attribute 'distros' -# is a list of distros that are supported, not a sub-module -from cloudinit import distros as ds - +from cloudinit.distros import ug_util from cloudinit import ssh_util from cloudinit import util @@ -197,8 +193,8 @@ def handle(_name, cfg, cloud, log, _args): "file %s", keytype, keyfile) try: - (users, _groups) = ds.normalize_users_groups(cfg, cloud.distro) - (user, _user_config) = ds.extract_default(users) + (users, _groups) = ug_util.normalize_users_groups(cfg, cloud.distro) + (user, _user_config) = ug_util.extract_default(users) disable_root = util.get_cfg_option_bool(cfg, "disable_root", True) disable_root_opts = util.get_cfg_option_str(cfg, "disable_root_opts", DISABLE_ROOT_OPTS) |