1 files changed, 56 insertions, 15 deletions
diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py
index cd97b99b..08fb63c6 100644
--- a/cloudinit/config/cc_ssh_import_id.py
+++ b/cloudinit/config/cc_ssh_import_id.py
@@ -19,42 +19,83 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from cloudinit import util
+import pwd
 
 # The ssh-import-id only seems to exist on ubuntu (for now)
 # https://launchpad.net/ssh-import-id
 distros = ['ubuntu']
 
 
-def handle(name, cfg, cloud, log, args):
+def handle(_name, cfg, cloud, log, args):
+
+    # import for "user: XXXXX"
     if len(args) != 0:
         user = args[0]
         ids = []
         if len(args) > 1:
             ids = args[1:]
-    else:
-        user = cloud.distro.get_default_user()
 
-        if 'users' in cfg:
-            user_zero = cfg['users'].keys()[0]
+        import_ssh_ids(ids, user, log)
+        return
+
+    # import for cloudinit created users
+    elist = []
+    for user_cfg in cfg['users']:
+        user = None
+        import_ids = []
 
-            if user_zero != "default":
-                user = user_zero
+        if isinstance(user_cfg, str) and user_cfg == "default":
+            user = cloud.distro.get_default_user()
+            if not user:
+                continue
 
-        ids = util.get_cfg_option_list(cfg, "ssh_import_id", [])
+            import_ids = util.get_cfg_option_list(cfg, "ssh_import_id", [])
 
-    if len(ids) == 0:
-        log.debug("Skipping module named %s, no ids found to import", name)
-        return
+        elif isinstance(user_cfg, dict):
+            user = None
+            import_ids = []
+
+            try:
+                user = user_cfg['name']
+                import_ids = user_cfg['ssh_import_id']
+
+                if import_ids and isinstance(import_ids, str):
+                    import_ids = str(import_ids).split(',')
+
+            except:
+                log.debug("user %s is not configured for ssh_import" % user)
+                continue
 
-    if not user:
-        log.debug("Skipping module named %s, no user found to import", name)
+        if not len(import_ids):
+            continue
+
+        try:
+            import_ssh_ids(import_ids, user, log)
+        except Exception as exc:
+            util.logexc(log, "ssh-import-id failed for: %s %s" %
+                            (user, import_ids), exc)
+            elist.append(exc)
+
+    if len(elist):
+        raise elist[0]
+
+
+def import_ssh_ids(ids, user, log):
+
+    if not (user and ids):
+        log.debug("empty user(%s) or ids(%s). not importing", user, ids)
         return
 
+    try:
+        _check = pwd.getpwnam(user)
+    except KeyError as exc:
+        raise exc
+
     cmd = ["sudo", "-Hu", user, "ssh-import-id"] + ids
     log.debug("Importing ssh ids for user %s.", user)
 
     try:
         util.subp(cmd, capture=False)
-    except util.ProcessExecutionError as e:
+    except util.ProcessExecutionError as exc:
         util.logexc(log, "Failed to run command to import %s ssh ids", user)
-        raise e
+        raise exc