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

fixed ubuntu facts for all versions

Browse source 
made sure NA is option of last resort
This commit is contained in:
Brian Coca 2015-05-29 16:13:30 -04:00
parent 2924c90a5d
commit a8c290cc3b
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/module_utils/facts.py
View file

@ -99,8 +99,9 @@ class Facts(object):
('/etc/os-release', 'SuSE'),
('/etc/gentoo-release', 'Gentoo'),
('/etc/os-release', 'Debian'),
('/etc/lsb-release', 'Mandriva'),
('/etc/os-release', 'NA'),
('/etc/lsb-release', 'Mandriva'))
)
SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' }
# A list of dicts. If there is a platform with more than one
@ -416,11 +417,13 @@ class Facts(object):
self.facts['distribution_version'] = self.facts['distribution_version'] + '.' + release.group(1)
elif name == 'Debian':
data = get_file_content(path)
if 'Debian' in data or 'Raspbian' in data:
if 'Ubuntu' in data:
break # Ubuntu gets correct info from python functions
elif 'Debian' in data or 'Raspbian' in data:
release = re.search("PRETTY_NAME=[^(]+ \(?([^)]+?)\)", data)
if release:
self.facts['distribution_release'] = release.groups()[0]
break
break
elif name == 'Mandriva':
data = get_file_content(path)
if 'Mandriva' in data:

2
lib/ansible/modules/core

@ -1 +1 @@
Subproject commit 5983d64d7728ea88ef27606e95e4aa34cde5ff46
Subproject commit 9cc23c749a8cd5039db7aa1998d310bbb04d1e13

2
lib/ansible/modules/extras

@ -1 +1 @@
Subproject commit 1276420a3a39340fcd9e053a1e621cdd89f480fa
Subproject commit a07fc88ba0d2546b92fbe93b2bede699fdf2bc48