diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2016-09-30 22:30:48 -0700 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-10-19 17:57:54 -0400 |
| commit | f0747c4b4cf073273e11d383f0354257be7276ed (patch) | |
| tree | 3f7a0426c12740395dbc5e668d546ca1a920e036 /cloudinit/config/cc_byobu.py | |
| parent | 7ae201166402fbf2e6c1632028be956a954835ef (diff) | |
| download | vyos-cloud-init-f0747c4b4cf073273e11d383f0354257be7276ed.tar.gz vyos-cloud-init-f0747c4b4cf073273e11d383f0354257be7276ed.zip | |
Move user/group functions to new ug_util file
The amount of code to do user and group normalization
and extraction deserves its own file so move the code
that does this to a new file and update references to the
old location.
This removes some of the funkyness done in config modules
to avoid namespace and attribute clashes as well.
Diffstat (limited to 'cloudinit/config/cc_byobu.py')
| -rwxr-xr-x[-rw-r--r--] | cloudinit/config/cc_byobu.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cloudinit/config/cc_byobu.py b/cloudinit/config/cc_byobu.py index 1f00dd90..4a616e26 100644..100755 --- a/cloudinit/config/cc_byobu.py +++ b/cloudinit/config/cc_byobu.py @@ -50,12 +50,7 @@ Valid configuration options for this module are: byobu_by_default: <user/system> """ - -# 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 util distros = ['ubuntu', 'debian'] @@ -94,8 +89,8 @@ def handle(name, cfg, cloud, log, args): shcmd = "" if mod_user: - (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) if not user: log.warn(("No default byobu user provided, " "can not launch %s for the default user"), bl_inst) |