internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 05:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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:

2
lib/ansible/modules/core

Submodule lib/ansible/modules/core updated: 9eb2b557cd...4549ea5e85

2
lib/ansible/modules/extras

Submodule lib/ansible/modules/extras updated: d9caac037c...86f08bfcda