x
/
cloud-init
Code Issues Proposed changes

Fix some docs + pylint warnings + log on default created in the module.

This commit is contained in:
Joshua Harlow 2012-09-21 15:12:11 -07:00
parent 78f370f116
commit 4401b1c134
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloudinit/config/cc_users_groups.py
View File

@ -24,7 +24,6 @@ frequency = PER_INSTANCE
def handle(name, cfg, cloud, log, _args):
distro = cloud.distro
((users, default_user), groups) = distro.normalize_users_groups(cfg)
for (name, members) in groups.items():
@ -34,7 +33,6 @@ def handle(name, cfg, cloud, log, _args):
user = default_user['name']
config = default_user['config']
def_base_config = {
'name': user,
'plain_text_passwd': user,
'home': "/home/%s" % user,
'shell': "/bin/bash",
@ -43,7 +41,8 @@ def handle(name, cfg, cloud, log, _args):
'sudo': "ALL=(ALL) NOPASSWD:ALL",
}
u_config = util.mergemanydict([def_base_config, config])
distro.create_user(**u_config)
distro.create_user(user, **u_config)
log.info("Added default '%s' user with passwordless sudo", user)
for (user, config) in users.items():
distro.create_user(user, **config)

3
cloudinit/distros/__init__.py
View File

@ -400,7 +400,8 @@ class Distro(object):
}
else:
LOG.warn(("Distro has not provided a default user "
"creation. No default user will be normalized."))
"for creation. No default user will be "
"normalized."))
users.pop('default', None)
except NotImplementedError:
LOG.warn(("Distro has not implemented default user "

10
doc/examples/cloud-config-user-groups.txt
View File

@ -1,11 +1,11 @@
# add groups to the system
# Add groups to the system
# The following example adds the ubuntu group with members foo and bar and
# the group cloud-users.
groups:
- ubuntu: [foo,bar]
- cloud-users
# add users to the system. Users are added after groups are added.
# Add users to the system. Users are added after groups are added.
users:
- default
- name: foobar
@ -81,16 +81,18 @@ users:
# directive.
# system: Create the user as a system user. This means no home directory.
#
# Default user creation:
#
# Unless you define users, you will get a 'ubuntu' user on buntu systems with the
# Unless you define users, you will get a 'ubuntu' user on ubuntu systems with the
# legacy permission (no password sudo, locked user, etc). If however, you want
# to have the ubuntu user in addition to other users, you need to instruct
# to have the 'ubuntu' user in addition to other users, you need to instruct
# cloud-init that you also want the default user. To do this use the following
# syntax:
# users:
# - default
# - bob
# - ....
# foobar: ...
#
# users[0] (the first user in users) overrides the user directive.

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

@ -78,21 +78,21 @@ class TestUGNormalize(MockerTestCase):
'default': True,
}
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((_users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertEquals('bob', def_user['name'])
ug_cfg = {
'users': {
'default': 'yes',
}
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((_users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertEquals('bob', def_user['name'])
ug_cfg = {
'users': {
'default': '1',
}
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((_users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertEquals('bob', def_user['name'])
def test_users_simple_dict_no(self):
@ -102,14 +102,14 @@ class TestUGNormalize(MockerTestCase):
'default': False,
}
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((_users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertEquals({}, def_user)
ug_cfg = {
'users': {
'default': 'no',
}
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((_users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertEquals({}, def_user)
def test_users_simple_csv(self):
@ -117,7 +117,7 @@ class TestUGNormalize(MockerTestCase):
ug_cfg = {
'users': 'joe,bob',
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((users, _def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('joe', users)
self.assertIn('bob', users)
self.assertEquals({}, users['joe'])
@ -131,7 +131,7 @@ class TestUGNormalize(MockerTestCase):
'bob'
],
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((users, _def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('joe', users)
self.assertIn('bob', users)
self.assertEquals({}, users['joe'])
@ -144,7 +144,7 @@ class TestUGNormalize(MockerTestCase):
{'name': 'default', 'blah': True}
],
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('bob', def_user['name'])
self.assertEquals(",".join(distro.get_default_user_groups()),
def_user['config']['groups'])
@ -159,7 +159,7 @@ class TestUGNormalize(MockerTestCase):
'default',
],
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((users, def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('bob', def_user['name'])
self.assertEquals(",".join(distro.get_default_user_groups()),
def_user['config']['groups'])
@ -174,7 +174,7 @@ class TestUGNormalize(MockerTestCase):
{'name': 'bob'},
],
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((users, _def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('joe', users)
self.assertIn('bob', users)
self.assertEquals({'tr_me': True}, users['joe'])
@ -188,7 +188,7 @@ class TestUGNormalize(MockerTestCase):
{'name': 'bob'},
],
}
((users, def_user), groups) = distro.normalize_users_groups(ug_cfg)
((users, _def_user), _groups) = distro.normalize_users_groups(ug_cfg)
self.assertIn('joe', users)
self.assertIn('bob', users)
self.assertEquals({}, users['joe'])