ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-02 14:40:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

move machine_id back to Facts class

Browse source
This commit is contained in:
Robin Roth 2016-04-27 09:29:39 +02:00
parent 5626c540ce
commit b861083dfb
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,6 +241,10 @@ class Facts(object):
self.facts['architecture'] = data[0]
elif self.facts['system'] == 'OpenBSD':
self.facts['architecture'] = platform.uname()[5]
machine_id = get_file_content("/var/lib/dbus/machine-id") or get_file_content("/etc/machine-id")
if machine_id:
machine_id = machine_id.split('\n')[0]
self.facts["machine_id"] = machine_id
def get_local_facts(self):
@ -702,10 +706,6 @@ class Distribution(object):
except AttributeError:
pass
machine_id = get_file_content("/var/lib/dbus/machine-id") or get_file_content("/etc/machine-id")
if machine_id:
machine_id = machine_id.split('\n')[0]
self.facts["machine_id"] = machine_id
self.facts['os_family'] = self.facts['distribution']
distro = self.facts['distribution'].replace(' ', '_')
if distro in self.OS_FAMILY: