Merge pull request #21848 from rallytime/bp-21635

Backport #21635 to 2014.7
2024-11-08 17:33:54 +00:00 · 2015-03-20 11:36:21 -06:00 · 2015-03-20 11:36:21 -06:00 · c27692cdab
commit c27692cdab
parent 8262d85998 c0f041410a
1 changed files with 6 additions and 3 deletions
--- a/salt/states/ssh_auth.py
+++ b/salt/states/ssh_auth.py
@ -187,11 +187,14 @@ def present(
            else:
                # Split keyline to get key und commen
                keyline = keyline.split(' ')
+                key_type = keyline[0]
+                key_value = keyline[1]
+                key_comment = keyline[2] if len(keyline) > 2 else ''
                data = __salt__['ssh.set_auth_key'](
                        user,
-                        keyline[1],
-                        keyline[0],
-                        keyline[2],
+                        key_value,
+                        key_type,
+                        key_comment,
                        options or [],
                        config)
    else: