Merge pull request #13100 from ghislainbourgeois/patch-2

Fix get_dns_facts on inexistent resolv.conf
This commit is contained in:
Brian Coca 2015-11-09 13:10:15 -08:00
commit 74d76105aa

View file

@ -727,7 +727,7 @@ class Facts(object):
def get_dns_facts(self):
self.facts['dns'] = {}
for line in get_file_lines('/etc/resolv.conf'):
for line in get_file_content('/etc/resolv.conf', '').splitlines():
if line.startswith('#') or line.startswith(';') or line.strip() == '':
continue
tokens = line.split()