diff options
| author | Scott Moser <smoser@brickies.net> | 2016-10-26 09:05:42 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-10-26 09:05:42 -0400 |
| commit | dae16284ed1b7e88365af5df23e9d74f3b73e8df (patch) | |
| tree | eacef2b3778f01ac3e1af2bbe694be2b9bfb5f74 | |
| parent | ce6a8c318ffd3dbcb7d976295a6974aebb47945a (diff) | |
| parent | f7a5756205ef726d95259e06b7c46ff0ef82ea28 (diff) | |
| download | vyos-cloud-init-dae16284ed1b7e88365af5df23e9d74f3b73e8df.tar.gz vyos-cloud-init-dae16284ed1b7e88365af5df23e9d74f3b73e8df.zip | |
merge from master at 0.7.8-28-gf7a5756
| -rw-r--r-- | cloudinit/config/cc_users_groups.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py index cf9a6259..36352362 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -99,7 +99,7 @@ config keys for an entry in ``users`` are as follows: # 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.settings import PER_INSTANCE @@ -107,7 +107,7 @@ frequency = PER_INSTANCE def handle(name, cfg, cloud, _log, _args): - (users, groups) = ds.normalize_users_groups(cfg, cloud.distro) + (users, groups) = ug_util.normalize_users_groups(cfg, cloud.distro) for (name, members) in groups.items(): cloud.distro.create_group(name, members) for (user, config) in users.items(): |