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

Merge pull request #5075 from gservat/patch-1

Browse source 
Added support for parsing in the SLES patch level correctly
This commit is contained in:
jctanner 2013-12-05 13:34:57 -08:00
commit 5040665cd0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
system/setup
View file

@ -117,7 +117,8 @@ class Facts(object):
'/etc/system-release': 'OtherLinux', '/etc/system-release': 'OtherLinux',
'/etc/alpine-release': 'Alpine', '/etc/alpine-release': 'Alpine',
'/etc/release': 'Solaris', '/etc/release': 'Solaris',
'/etc/arch-release': 'Archlinux' } '/etc/arch-release': 'Archlinux',
'/etc/SuSE-release': 'SuSE' }
SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' } SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' }
# A list of dicts. If there is a platform with more than one # A list of dicts. If there is a platform with more than one
@ -324,6 +325,9 @@ class Facts(object):
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]
self.facts['distribution_release'] = ora_prefix + data self.facts['distribution_release'] = ora_prefix + data
elif name == 'SuSE':
data = get_file_content(path).splitlines()
self.facts['distribution_release'] = data[2].split('=')[1].strip()
else: else:
self.facts['distribution'] = name self.facts['distribution'] = name