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

Minor changes to simplify code

Browse source
This commit is contained in:
Dimos Alevizos 2013-12-08 09:02:50 +02:00
parent de4e4c54b9
commit 8c73aa13e4
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
library/system/setup
View file

@ -1020,28 +1020,26 @@ class FreeBSDHardware(Hardware):
# Fall back to using dmidecode, if available # Fall back to using dmidecode, if available
dmi_bin = module.get_bin_path('dmidecode') dmi_bin = module.get_bin_path('dmidecode')
DMI_DICT = { DMI_DICT = dict(
'bios_date': 'bios-release-date', bios_date='bios-release-date',
'bios_version': 'bios-version', bios_version='bios-version',
'form_factor': 'chassis-type', form_factor='chassis-type',
'product_name': 'system-product-name', product_name='system-product-name',
'product_serial': 'system-serial-number', product_serial='system-serial-number',
'product_uuid': 'system-uuid', product_uuid='system-uuid',
'product_version': 'system-version', product_version='system-version',
'system_vendor': 'system-manufacturer' system_vendor='system-manufacturer'
} )
for (k, v) in DMI_DICT.items(): for (k, v) in DMI_DICT.items():
if dmi_bin is not None: if dmi_bin is not None:
(rc, out, err) = module.run_command('%s -s %s' % (dmi_bin, v)) (rc, out, err) = module.run_command('%s -s %s' % (dmi_bin, v))
if rc == 0: if rc == 0:
# Strip out commented lines (specific dmidecode output) # Strip out commented lines (specific dmidecode output)
thisvalue = ''.join([ line for line in out.split('\n') if not line.startswith('#') ]) self.facts[k] = ''.join([ line for line in out.split('\n') if not line.startswith('#') ])
try: try:
json.dumps(thisvalue) json.dumps(self.facts[k])
except UnicodeDecodeError: except UnicodeDecodeError:
thisvalue = "NA" self.facts[k] = 'NA'
self.facts[k] = thisvalue
else: else:
self.facts[k] = 'NA' self.facts[k] = 'NA'
else: else: