1. Cleanup the user creation so that the distro class is

responsible only for creating users and groups and
normalizing a input configuration into a normalized
format that splits up the user list, the group list
and the default user listsand let the add user/group config 
module handle calling those methods to add its own users/groups 
and the default user (if any).

2. Also add in tests for this normalization process to ensure
that it is pretty bug free and works with the different types
of formats that users/groups/defaults + options can take.

1 files changed, 24 insertions, 53 deletions

diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py
index 418f3330..273c5068 100644
--- a/cloudinit/config/cc_users_groups.py
+++ b/cloudinit/config/cc_users_groups.py
@@ -16,63 +16,34 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from cloudinit import util
+
 from cloudinit.settings import PER_INSTANCE
 
 frequency = PER_INSTANCE
 
 
 def handle(name, cfg, cloud, log, _args):
-    user_zero = None
-
-    if 'groups' in cfg:
-        for group in cfg['groups']:
-            if isinstance(group, dict):
-                for name, values in group.iteritems():
-                    if isinstance(values, list):
-                        cloud.distro.create_group(name, values)
-                    elif isinstance(values, str):
-                        cloud.distro.create_group(name, values.split(','))
-            else:
-                cloud.distro.create_group(group, [])
-
-    if 'users' in cfg:
-        user_zero = None
-
-        for user_config in cfg['users']:
-
-            # Handle the default user creation
-            if 'default' in user_config:
-                log.info("Creating default user")
-
-                # Create the default user if so defined
-                try:
-                    cloud.distro.add_default_user()
-
-                    if not user_zero:
-                        user_zero = cloud.distro.get_default_user()
-
-                except NotImplementedError:
-
-                    if user_zero == name:
-                        user_zero = None
-
-                    log.warn("Distro has not implemented default user "
-                             "creation. No default user will be created")
-
-            elif isinstance(user_config, dict) and 'name' in user_config:
-
-                name = user_config['name']
-                if not user_zero:
-                    user_zero = name
-
-                # Make options friendly for distro.create_user
-                new_opts = {}
-                if isinstance(user_config, dict):
-                    for opt in user_config:
-                        new_opts[opt.replace('-', '_')] = user_config[opt]
-
-                cloud.distro.create_user(**new_opts)
 
-            else:
-                # create user with no configuration
-                cloud.distro.create_user(user_config)
+    distro = cloud.distro
+    ((users, default_user), groups) = distro.normalize_users_groups(cfg)
+    for (name, members) in groups.items():
+        distro.create_group(name, members)
+
+    if default_user:
+        user = default_user['name']
+        config = default_user['config']
+        def_base_config = {
+            'name': user,
+            'plain_text_passwd': user,
+            'home': "/home/%s" % user,
+            'shell': "/bin/bash",
+            'lock_passwd': True,
+            'gecos': "%s%s" % (user.title()),
+            'sudo': "ALL=(ALL) NOPASSWD:ALL",
+        }
+        u_config = util.mergemanydict([def_base_config, config])
+        distro.create_user(**u_config)
+
+    for (user, config) in users.items():
+        distro.create_user(user, **config)