← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~raharper/cloud-init:fix_cc_user_groups_normalize into cloud-init:master


Ryan Harper has proposed merging ~raharper/cloud-init:fix_cc_user_groups_normalize into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:

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.
Your team cloud init development team is requested to review the proposed merge of ~raharper/cloud-init:fix_cc_user_groups_normalize into cloud-init:master.
diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py
index cf9a625..3635236 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():

Follow ups