External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-28 22:35:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #276 from chrismeyersfsu/fix-fact_inventory_relationship

Browse Source 
associate scan runs with a particular inventory host
This commit is contained in:
Chris Meyers
2015-06-11 20:55:13 -04:00
parent 0013e89361 0c7638bdd7
commit d5b7be3f4f
8 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/management/commands/run_fact_cache_receiver.py
View File

@@ -34,6 +34,7 @@ class FactCacheReceiver(object):
def process_fact_message(self, message):
hostname = message['host']
inventory_id = message['inventory_id']
facts_data = message['facts']
date_key = message['date_key']
@@ -43,12 +44,12 @@ class FactCacheReceiver(object):
return
try:
host = FactHost.objects.get(hostname=hostname)
host = FactHost.objects.get(hostname=hostname, inventory_id=inventory_id)
except FactHost.DoesNotExist:
host = FactHost(hostname=hostname)
host = FactHost(hostname=hostname, inventory_id=inventory_id)
host.save()
except FactHost.MultipleObjectsReturned:
query = "db['fact_host'].find(hostname=%s)" % hostname
query = "db['fact_host'].find(hostname=%s, inventory_id=%s)" % (hostname, inventory_id)
logger.warn('Database inconsistent. Multiple FactHost "%s" exist. Try the query %s to find the records.' % (hostname, query))
return
except Exception, e: