summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-09-21 14:38:40 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-09-21 14:38:40 -0700
commit47d9df78264625207342e668a9120fa84b6ad355 (patch)
tree7aaaeff040dcebdb67616616f189709c78ac08cb /cloudinit/distros
parent712d019cba5afb535033e8228ad365071661ceb2 (diff)
downloadvyos-cloud-init-47d9df78264625207342e668a9120fa84b6ad355.tar.gz
vyos-cloud-init-47d9df78264625207342e668a9120fa84b6ad355.zip
Also allow the user list to come in as a comma
separated list so that its types match more of what the group list can be.
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 4fb1d8c2..361d2c05 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -338,6 +338,8 @@ class Distro(object):
raise TypeError(("Unmappable user value type %s"
" for key %s") % (util.obj_name(v), k))
u_cfg = ad_ucfg
+ elif isinstance(u_cfg, (str, basestring)):
+ u_cfg = u_cfg.strip().split(",")
users = {}
for user_config in u_cfg: