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

non-celery invocations (command-line invocations) do not update the inventory_update object after completion

Browse Source
This commit is contained in:
Chris Meyers
2015-06-17 12:36:07 -04:00
parent fcc789f13b
commit d2a555b752
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/management/commands/inventory_import.py
View File

@@ -654,7 +654,7 @@ class Command(NoArgsCommand):
inventory_source_id) inventory_source_id)
try: try:
self.inventory_update = InventoryUpdate.objects.get(pk=inventory_update_id) self.inventory_update = InventoryUpdate.objects.get(pk=inventory_update_id)
except InventorySource.DoesNotExist: except InventoryUpdate.DoesNotExist:
raise CommandError('Inventory update with id=%s not found' % raise CommandError('Inventory update with id=%s not found' %
inventory_update_id) inventory_update_id)
# Otherwise, create a new inventory source to capture this invocation # Otherwise, create a new inventory source to capture this invocation
@@ -1222,6 +1222,8 @@ class Command(NoArgsCommand):
self.exclude_empty_groups = bool(options.get('exclude_empty_groups', False)) self.exclude_empty_groups = bool(options.get('exclude_empty_groups', False))
self.instance_id_var = options.get('instance_id_var', None) self.instance_id_var = options.get('instance_id_var', None)
self.celery_invoked = False if os.getenv('INVENTORY_SOURCE_ID', None) is None else True
# Load inventory and related objects from database. # Load inventory and related objects from database.
if self.inventory_name and self.inventory_id: if self.inventory_name and self.inventory_id:
raise CommandError('--inventory-name and --inventory-id are mutually exclusive') raise CommandError('--inventory-name and --inventory-id are mutually exclusive')
@@ -1326,11 +1328,12 @@ class Command(NoArgsCommand):
exc = e exc = e
transaction.rollback() transaction.rollback()
with ignore_inventory_computed_fields(): if self.celery_invoked is False:
self.inventory_update = InventoryUpdate.objects.get(pk=self.inventory_update.pk) with ignore_inventory_computed_fields():
self.inventory_update.result_traceback = tb self.inventory_update = InventoryUpdate.objects.get(pk=self.inventory_update.pk)
self.inventory_update.status = status self.inventory_update.result_traceback = tb
self.inventory_update.save(update_fields=['status', 'result_traceback']) self.inventory_update.status = status
self.inventory_update.save(update_fields=['status', 'result_traceback'])
if exc and isinstance(exc, CommandError): if exc and isinstance(exc, CommandError):
sys.exit(1) sys.exit(1)