fixup groups

bundles/users/items.py

@@ -8,6 +8,12 @@ pkg_apt = {
     'tmux': {},
 }
 
+users['root'] = {
+    'home': '/root',
+    'shell': '/bin/bash',
+    'password': repo.vault.human_password_for('root on {}'.format(node.name)),
+}
+
 for username, attrs in node.metadata['users'].items():
     home = attrs.get('home', '/home/{}'.format(username))
 
@@ -22,6 +28,9 @@ for username, attrs in node.metadata['users'].items():
         user['shell'] = attrs.get('shell', '/usr/bin/fish')
         user['password'] = repo.vault.human_password_for('user {} on {}'.format(username, node.name))
 
+        if 'groups' in attrs:
+            user['groups'] = attrs['groups']
+
         directories[home] = {
             'owner': username,
             'mode': '0700',

bundles/users/metadata.py

@@ -1,11 +0,0 @@
-@metadata_processor
-def root_user(metadata):
-    return {
-        'users': {
-            'root': {
-                'home': '/root',
-                'ssh_pubkey': [],
-                'shell': '/bin/bash',
-            },
-        },
-    }, DEFAULTS, DONE

bundles/vmhost/metadata.py

@@ -1,11 +0,0 @@
-@metadata_processor
-def add_users_to_libvirt_group(metadata):
-    if 'users' in metadata:
-        for user in metadata['users']:
-            if 'groups' not in metadata['users'][user]:
-                metadata['users'][user]['groups'] = []
-
-            if 'libvirt' not in metadata['users'][user]['groups']:
-                metadata['users'][user]['groups'].append('libvirt')
-
-    return metadata, RUN_ME_AGAIN