mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-04 11:17:05 +00:00
[PR #5720/6383c823 backport][stable-6] ssh_config: fixed sanity (#5726)
ssh_config: fixed sanity (#5720)
* ssh_config: fix sanity checks
* fixed mod utils and removed sanity ignores
* update BOTMETA
* add changelog fragment
* Update plugins/module_utils/ssh.py
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 6383c82328)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
0f0ad6b6d1
commit
5fcf5d0c8b
9 changed files with 27 additions and 9 deletions
|
|
@ -169,6 +169,7 @@ except ImportError:
|
|||
|
||||
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
|
||||
from ansible.module_utils.common.text.converters import to_native
|
||||
from ansible_collections.community.general.plugins.module_utils.ssh import determine_config_file
|
||||
|
||||
|
||||
class SSHConfig():
|
||||
|
|
@ -188,10 +189,7 @@ class SSHConfig():
|
|||
self.config.load()
|
||||
|
||||
def check_ssh_config_path(self):
|
||||
if self.user:
|
||||
self.config_file = os.path.join(os.path.expanduser('~%s' % self.user), '.ssh', 'config')
|
||||
elif self.config_file is None:
|
||||
self.config_file = '/etc/ssh/ssh_config'
|
||||
self.config_file = determine_config_file(self.user, self.config_file)
|
||||
|
||||
# See if the identity file exists or not, relative to the config file
|
||||
if os.path.exists(self.config_file) and self.identity_file is not None:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue