diff options
| author | Robin Roth <robin@rroth.de> | 2016-04-14 19:01:24 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-04-18 23:26:53 -0700 |
| commit | cd101967d89e221986f982eace4b39cece8bab69 (patch) | |
| tree | 98547d307e09d7de8136f3c1458712730646d5e0 | |
| parent | 0df4bfe0639e059db3da8bfdb956934582698fe1 (diff) | |
| download | ansible-cd101967d89e221986f982eace4b39cece8bab69.tar.gz | |
fix tests for SLES and CoreOS
* include #15230
| -rw-r--r-- | lib/ansible/module_utils/facts.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index c462396666..90a38d0100 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -119,8 +119,8 @@ class Facts(object): ('/etc/alpine-release', 'Alpine'), ('/etc/release', 'Solaris'), ('/etc/arch-release', 'Archlinux'), - ('/etc/SuSE-release', 'SuSE'), ('/etc/os-release', 'SuSE'), + ('/etc/SuSE-release', 'SuSE'), ('/etc/gentoo-release', 'Gentoo'), ('/etc/os-release', 'Debian'), ('/etc/lsb-release', 'Mandriva'), @@ -445,7 +445,7 @@ class Facts(object): self.facts['distribution_release'] = release.groups()[0] elif 'enterprise' in data.lower() and 'VERSION_ID' in line: release = re.search('^VERSION_ID="?[0-9]+\.?([0-9]*)"?', line) # SLES doesn't got funny release names - if release.group(1): + if release and release.group(1): release = release.group(1) else: release = "0" # no minor number, so it is the first release @@ -506,9 +506,11 @@ 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") |