cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use os.path.join where appropriate

Browse source
This commit is contained in:
Stephen Fromm 2012-10-19 22:22:27 -07:00
parent 213b2306be
commit fb87376b1b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
user
View file

@ -354,7 +354,7 @@ def get_ssh_key_path(user, ssh_file):
if os.path.isabs(ssh_file): if os.path.isabs(ssh_file):
ssh_key_file = ssh_file ssh_key_file = ssh_file
else: else:
ssh_key_file = "%s/%s" % (info[5], ssh_file) ssh_key_file = os.path.join(info[5], ssh_file)
return ssh_key_file return ssh_key_file
def ssh_key_gen(module, user, ssh): def ssh_key_gen(module, user, ssh):
@ -419,7 +419,7 @@ def main():
'passphrase': None, 'passphrase': None,
'comment': 'ansible-generated' 'comment': 'ansible-generated'
} }
ssh_defaults['file'] = '.ssh/id_%s' % ssh_defaults['type'] ssh_defaults['file'] = os.path.join('.ssh', 'id_%s' % ssh_defaults['type'])
ssh = dict(ssh_defaults) ssh = dict(ssh_defaults)
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
@ -473,7 +473,7 @@ def main():
ssh['passphrase'] = module.params['ssh_key_passphrase'] ssh['passphrase'] = module.params['ssh_key_passphrase']
# If using default filename, make sure it is named appropriately # If using default filename, make sure it is named appropriately
if ssh['file'] == ssh_defaults['file']: if ssh['file'] == ssh_defaults['file']:
ssh['file'] = '.ssh/id_%s' % ssh['type'] ssh['file'] = os.path.join('.ssh', 'id_%s' % ssh_defaults['type'])
rc = None rc = None