Merge pull request #13471 from davidlballenger/issue_13438

Issue 13438
This commit is contained in:
James Cammarata 2015-12-08 10:59:29 -05:00
commit 1380c71fe0

View file

@ -524,7 +524,10 @@ class Facts(object):
keytypes = ('dsa', 'rsa', 'ecdsa', 'ed25519')
if self.facts['system'] == 'Darwin':
keydir = '/etc'
if self.facts['distribution'] == 'MacOSX' and LooseVersion(self.facts['distribution_version']) >= LooseVersion('10.11') :
keydir = '/etc/ssh'
else:
keydir = '/etc'
else:
keydir = '/etc/ssh'