diff options
| author | Brian Coca <bcoca@ansible.com> | 2016-03-31 17:46:52 -0400 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2016-03-31 17:46:52 -0400 |
| commit | 3b5d7400deae85fd720db2950801ef40789b8b57 (patch) | |
| tree | b04441be3f7be4c76b9c94f1fdeb1f6634e1670f | |
| parent | 7de237c5a1742660bc240c15e97a1f5b0d1611a8 (diff) | |
| parent | 39b16f294c8edf513e31bded7a850dde66301dee (diff) | |
| download | ansible-stable-2.0.0.1.tar.gz | |
Merge pull request #15230 from someword/15228stable-2.0.0.1
Only set distribution_release on CoreOS nodes that autoupdate. Fixes…
| -rw-r--r-- | lib/ansible/module_utils/facts.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 796ebc92bd..a9030c2dd4 100644 --- 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") |