Merge pull request #13100 from ghislainbourgeois/patch-2

Fix get_dns_facts on inexistent resolv.conf
9 years ago · 74d76105aa
parent e36b4e2a13 eb850d7e5b
commit 74d76105aa
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/module_utils/facts.py
+++ b/lib/ansible/module_utils/facts.py
@ -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()