cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use first line from /etc/release in "distribution_release" for consistency across Solaris and derivatives.

Browse source
This commit is contained in:
Chris Gardner 2013-06-03 22:33:01 +01:00
parent 3bdf742d50
commit 28cc0119a1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
system/setup
View file

@ -238,13 +238,13 @@ class Facts(object):
self.facts['distribution_version'] = data self.facts['distribution_version'] = data
elif name == 'Solaris': elif name == 'Solaris':
data = get_file_content(path).split('\n')[0] data = get_file_content(path).split('\n')[0]
ora_prefix = ''
if 'Oracle Solaris' in data: if 'Oracle Solaris' in data:
data = " ".join(data.split()[1:None]) data = data.replace('Oracle ','')
ora_prefix = 'Oracle '
self.facts['distribution'] = data.split()[0] self.facts['distribution'] = data.split()[0]
self.facts['distribution_version'] = data.split()[1] self.facts['distribution_version'] = data.split()[1]
distribution_release = " ".join(data.split()[2:None]) self.facts['distribution_release'] = ora_prefix + data
if distribution_release != 'X86' and distribution_release != 'SPARC':
self.facts['distribution_release'] = distribution_release
else: else:
self.facts['distribution'] = name self.facts['distribution'] = name