ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

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

Browse source 
* Fixes https://github.com/ansible/ansible/issues/29028

* raise Exception when no home directory
This commit is contained in:
Job Evers‐Meltzer 2018-04-13 16:22:53 -04:00 committed by Brian Coca
parent c1e4ef39cb
commit 636e705260
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/system/user.py
View file

@ -619,14 +619,18 @@ class User(object):
if os.path.isabs(self.ssh_file): if os.path.isabs(self.ssh_file):
ssh_key_file = self.ssh_file ssh_key_file = self.ssh_file
else: 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) ssh_key_file = os.path.join(info[5], self.ssh_file)
return ssh_key_file return ssh_key_file
def ssh_key_gen(self): def ssh_key_gen(self):
info = self.user_info() info = self.user_info()
if not os.path.exists(info[5]) and not self.module.check_mode: try:
return (1, '', 'User %s home directory does not exist' % self.name) ssh_key_file = self.get_ssh_key_path()
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) ssh_dir = os.path.dirname(ssh_key_file)
if not os.path.exists(ssh_dir): if not os.path.exists(ssh_dir):
if self.module.check_mode: if self.module.check_mode: