summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harper <ryan.harper@canonical.com>2016-10-25 19:05:22 -0500
committerRyan Harper <ryan.harper@canonical.com>2016-10-25 19:05:22 -0500
commitf7a5756205ef726d95259e06b7c46ff0ef82ea28 (patch)
tree655e9fc1a66e718c16e2342931689f9ef8850f29
parent29348af1c889931e8973f8fc8cb090c063316f7a (diff)
downloadvyos-cloud-init-f7a5756205ef726d95259e06b7c46ff0ef82ea28.tar.gz
vyos-cloud-init-f7a5756205ef726d95259e06b7c46ff0ef82ea28.zip
cc_users_groups: fix remaing call to ds.normalize_user_groups
Previous commit f0747c4b4cf073273e11d383f0354257be7276ed relocated normalize_users_groups to ug_util module, but missed modifying the cc_users_groups config module. Apply the location change to fix.
-rw-r--r--cloudinit/config/cc_users_groups.py4
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():