internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix distro detection for Solaris derivatives

Browse Source
This commit is contained in:
Nate Coraor
2016-06-07 15:12:37 -04:00
committed by Adrian Likins
parent 7bc3be64ae
commit 706778ee7f
2 changed files with 167 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ansible/module_utils/facts.py
View File

@@ -627,7 +627,6 @@ class Distribution(object):
{'path': '/etc/openwrt_release', 'name': 'OpenWrt'},
{'path': '/etc/system-release', 'name': 'Amazon'},
{'path': '/etc/alpine-release', 'name': 'Alpine'},
{'path': '/etc/release', 'name': 'Solaris'},
{'path': '/etc/arch-release', 'name': 'Archlinux', 'allowempty': True},
{'path': '/etc/os-release', 'name': 'SuSE'},
{'path': '/etc/SuSE-release', 'name': 'SuSE'},
@@ -674,8 +673,7 @@ class Distribution(object):
self.facts['distribution'] = self.system
self.facts['distribution_release'] = platform.release()
self.facts['distribution_version'] = platform.version()
systems_implemented = ('AIX', 'HP-UX', 'Darwin', 'FreeBSD', 'OpenBSD')
systems_implemented = ('AIX', 'HP-UX', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
self.facts['distribution'] = self.system
@@ -808,8 +806,8 @@ class Distribution(object):
self.facts['distribution'] = 'Alpine'
self.facts['distribution_version'] = data
def get_distribution_Solaris(self, name, data, path):
data = data.split('\n')[0]
def get_distribution_SunOS(self):
data = get_file_content('/etc/release').split('\n')[0]
if 'Solaris' in data:
ora_prefix = ''
if 'Oracle Solaris' in data:
@@ -820,7 +818,7 @@ class Distribution(object):
self.facts['distribution_release'] = ora_prefix + data
return
uname_rc, uname_out, uname_err = self.module.run_command(['uname', '-v'])
uname_v = get_uname_version(self.module)
distribution_version = None
if 'SmartOS' in data:
self.facts['distribution'] = 'SmartOS'
@@ -833,7 +831,7 @@ class Distribution(object):
elif 'OmniOS' in data:
self.facts['distribution'] = 'OmniOS'
distribution_version = data.split()[-1]
elif uname_rc == 0 and 'NexentaOS_' in uname_out:
elif uname_v is not None and 'NexentaOS_' in uname_v:
self.facts['distribution'] = 'Nexenta'
distribution_version = data.split()[-1].lstrip('v')
@@ -841,8 +839,8 @@ class Distribution(object):
self.facts['distribution_release'] = data.strip()
if distribution_version is not None:
self.facts['distribution_version'] = distribution_version
elif uname_rc == 0:
self.facts['distribution_version'] = uname_out.split('\n')[0].strip()
elif uname_v is not None:
self.facts['distribution_version'] = uname_v.split('\n')[0].strip()
return
return False # TODO: remove if tested without this
@@ -3185,6 +3183,12 @@ def get_file_content(path, default=None, strip=True):
pass
return data
def get_uname_version(module):
rc, out, err = module.run_command(['uname', '-v'])
if rc == 0:
return out
return None
def get_file_lines(path):
'''get list of lines from file'''
data = get_file_content(path)