x
/
cloud-init
Code Issues Proposed changes

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.
This commit is contained in:
Joshua Harlow 2012-09-21 14:38:40 -07:00
parent a4206d9a7c
commit 78f370f116
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudinit/distros/__init__.py
View File

@ -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:

11
tests/unittests/test_distros/test_user_data_normalize.py
View File

@ -112,6 +112,17 @@ class TestUGNormalize(MockerTestCase):
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
self.assertEquals({}, def_user)
def test_users_simple_csv(self):
distro = self._make_distro('ubuntu')
ug_cfg = {
'users': 'joe,bob',
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('joe', users)
self.assertIn('bob', users)
self.assertEquals({}, users['joe'])
self.assertEquals({}, users['bob'])
def test_users_simple(self):
distro = self._make_distro('ubuntu')
ug_cfg = {