Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix user module error when generating ssh keys w/o a home #29055

Merged
merged 2 commits into from
Apr 13, 2018
Merged

fix user module error when generating ssh keys w/o a home #29055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7a630
Fixes https://github.com/ansible/ansible/issues/29028
jobevers Sep 6, 2017
d5e8bef
raise Exception when no home directory
jobevers Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/ansible/modules/system/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,14 +641,18 @@ def get_ssh_key_path(self):
if os.path.isabs(self.ssh_file):
ssh_key_file = self.ssh_file
else:
if not os.path.exists(info[5]) and not self.module.check_mode:
raise Exception('User %s home directory does not exist' % self.name)
ssh_key_file = os.path.join(info[5], self.ssh_file)
return ssh_key_file

def ssh_key_gen(self):
info = self.user_info()
if not os.path.exists(info[5]) and not self.module.check_mode:
return (1, '', 'User %s home directory does not exist' % self.name)
ssh_key_file = self.get_ssh_key_path()
try:
ssh_key_file = self.get_ssh_key_path()
except Exception:
e = get_exception()
return (1, '', str(e))
ssh_dir = os.path.dirname(ssh_key_file)
if not os.path.exists(ssh_dir):
if self.module.check_mode:
Expand Down