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

fix Amazon system-release version parsing (#51521)

Browse source 
Previously it was assumed that the Amazon system-release
number was the final value of the string.  This isn't always
the case.  Some releases have the name at the end.

  Amazon Linux release 2
  Amazon Linux release 2 (Karoo)

Fix by instead looking for a number in the string.

Fixes #48823
This commit is contained in:
Jeremiah Mahler 2019-02-07 14:58:34 -08:00 committed by ansibot
parent c1e51ef486
commit ffbc9d99de
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/fix-Amazon-system-release-version-parsing.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fix Amazon system-release version parsing (https://github.com/ansible/ansible/issues/48823)

7
lib/ansible/module_utils/facts/system/distribution.py
View file

@ -228,10 +228,11 @@ class DistributionFiles:
def parse_distribution_file_Amazon(self, name, data, path, collected_facts):
amazon_facts = {}
if 'Amazon' not in data:
# return False # TODO: remove # huh?
return False, amazon_facts # TODO: remove
return False, amazon_facts
amazon_facts['distribution'] = 'Amazon'
amazon_facts['distribution_version'] = data.split()[-1]
version = [n for n in data.split() if n.isdigit()]
version = version[0] if version else 'NA'
amazon_facts['distribution_version'] = version
return True, amazon_facts
def parse_distribution_file_OpenWrt(self, name, data, path, collected_facts):