External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-16 00:17:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

rename insight tracking field; handle duplicate

Browse Source 
* rename from insights_machine_id to insights_system_id
* gracefully handle duplicate insights machine id's
This commit is contained in:
Chris Meyers
2017-05-12 10:47:49 -04:00
parent b9b0b29d97
commit 3cdc332497
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/plugins/library/scan_insights.py
View File

@@ -20,29 +20,29 @@ EXAMPLES = '''
# host | success >> {
# "ansible_facts": {
# "insights": {
# "machine_id": "4da7d1f8-14f3-4cdc-acd5-a3465a41f25d"
# "system_id": "4da7d1f8-14f3-4cdc-acd5-a3465a41f25d"
# }, ... }
'''
INSIGHTS_MACHINE_ID_FILE='/etc/redhat-access-insights/machine-id'
INSIGHTS_SYSTEM_ID_FILE='/etc/redhat-access-insights/machine-id'
def get_machine_uuid(filname):
machine_uuid = None
def get_system_uuid(filname):
system_uuid = None
try:
f = open(INSIGHTS_MACHINE_ID_FILE, "r")
f = open(INSIGHTS_SYSTEM_ID_FILE, "r")
except IOError:
return None
else:
try:
data = f.readline()
machine_uuid = str(uuid.UUID(data))
system_uuid = str(uuid.UUID(data))
except (IOError, ValueError):
pass
finally:
f.close()
return machine_uuid
return system_uuid
def main():
@@ -50,18 +50,18 @@ def main():
argument_spec = dict()
)
machine_uuid = get_machine_uuid(INSIGHTS_MACHINE_ID_FILE)
system_uuid = get_system_uuid(INSIGHTS_SYSTEM_ID_FILE)
if machine_uuid is not None:
if system_uuid is not None:
results = {
'ansible_facts': {
'insights': {
'machine_id': machine_uuid
'system_id': system_uuid
}
}
}
else:
results = dict(skipped=True, msg="Insights machine id not found")
results = dict(skipped=True, msg="Insights system id not found")
module.exit_json(**results)