zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-22 07:51:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update how we repopulate the /host/:id/smart_inventories data

Browse Source
This commit is contained in:
Wayne Witzel III
2017-07-13 14:04:33 -04:00
parent e93f1d3e79
commit 6f1ef7fe0b
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
awx/main/models/inventory.py
View File

@@ -384,6 +384,21 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin):
self.websocket_emit_status('pending_deletion')
delete_inventory.delay(self.pk)
def _update_host_smart_inventory_memeberships(self):
if self.kind == 'smart' and settings.AWX_REBUILD_SMART_MEMBERSHIP:
def on_commit():
from awx.main.tasks import update_host_smart_inventory_memberships
update_host_smart_inventory_memberships.delay()
connection.on_commit(on_commit)
def save(self, *args, **kwargs):
self._update_host_smart_inventory_memeberships()
super(Inventory, self).save(*args, **kwargs)
def delete(self, *args, **kwargs):
self._update_host_smart_inventory_memeberships()
super(Inventory, self).delete(*args, **kwargs)
class SmartInventoryMembership(BaseModel):
'''
@@ -568,6 +583,21 @@ class Host(CommonModelNameNotUnique):
host_name = self.variables_dict['ansible_host']
return host_name
def _update_host_smart_inventory_memeberships(self):
if settings.AWX_REBUILD_SMART_MEMBERSHIP:
def on_commit():
from awx.main.tasks import update_host_smart_inventory_memberships
update_host_smart_inventory_memberships.delay()
connection.on_commit(on_commit)
def save(self, *args, **kwargs):
self._update_host_smart_inventory_memeberships()
super(Host, self).save(*args, **kwargs)
def delete(self, *args, **kwargs):
self._update_host_smart_inventory_memeberships()
super(Host, self).delete(*args, **kwargs)
class Group(CommonModelNameNotUnique):
'''

2
awx/main/tasks.py
View File

@@ -347,7 +347,7 @@ def update_inventory_computed_fields(inventory_id, should_update_hosts=True):
def update_host_smart_inventory_memberships():
try:
with transaction.atomic():
smart_inventories = Inventory.objects.filter(kind='smart', host_filter__isnull=False)
smart_inventories = Inventory.objects.filter(kind='smart', host_filter__isnull=False, pending_deletion=False)
SmartInventoryMembership.objects.all().delete()
memberships = []
for smart_inventory in smart_inventories: