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

Merge pull request #5426 from lichesser/debian_release_4565

Browse source 
setup module: Partial fix for #4565, reporting Debian release version. Works only for Debian 7 and later
This commit is contained in:
jctanner 2014-01-14 13:00:08 -08:00
commit 9779206142
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
system/setup
View file

@ -118,7 +118,8 @@ class Facts(object):
'/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' } '/etc/SuSE-release': 'SuSE',
'/etc/os-release': 'Debian' }
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
@ -328,6 +329,11 @@ class Facts(object):
elif name == 'SuSE': elif name == 'SuSE':
data = get_file_content(path).splitlines() data = get_file_content(path).splitlines()
self.facts['distribution_release'] = data[2].split('=')[1].strip() self.facts['distribution_release'] = data[2].split('=')[1].strip()
elif name == 'Debian':
data = get_file_content(path).split('\n')[0]
release = re.search("PRETTY_NAME.+ \(?([^ ]+?)\)?\"", data)
if release:
self.facts['distribution_release'] = release.groups()[0]
else: else:
self.facts['distribution'] = name self.facts['distribution'] = name