Merge pull request #15230 from someword/15228

Only set distribution_release on CoreOS nodes that autoupdate. Fixes…
9 years ago · 3b5d7400de
parent 7de237c5a1 39b16f294c
commit 3b5d7400de
1 changed files with 4 additions and 3 deletions
--- a/lib/ansible/module_utils/facts.py
+++ b/lib/ansible/module_utils/facts.py
@ -493,9 +493,10 @@ class Facts(object):

                            if self.facts['distribution'].lower() == 'coreos':
                                data = get_file_content('/etc/coreos/update.conf')
-                                release = re.search("^GROUP=(.*)", data)
-                                if release:
-                                    self.facts['distribution_release'] = release.group(1).strip('"')
+                                if data:
+                                    release = re.search("^GROUP=(.*)", data)
+                                    if release:
+                                        self.facts['distribution_release'] = release.group(1).strip('"')
                    else:
                        self.facts['distribution'] = name
        machine_id = get_file_content("/var/lib/dbus/machine-id") or get_file_content("/etc/machine-id")