From 18ecdb65da7d2acc6b9cb1e079474d7fd7f0bde8 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 31 Oct 2013 12:49:39 -0400 Subject: [PATCH] AC-550 Expose license errors flag, update how license error shows in inventory update stdout. --- awx/main/management/commands/inventory_import.py | 4 +++- awx/main/serializers.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 9cb57b2e0f..7f38005980 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -743,5 +743,7 @@ class Command(NoArgsCommand): self.inventory_update.save(update_fields=['status', 'result_traceback']) transaction.commit() - if exc: + if exc and isinstance(exc, CommandError): + sys.exit(1) + elif exc: raise exc diff --git a/awx/main/serializers.py b/awx/main/serializers.py index f10cebc762..2d14a341ad 100644 --- a/awx/main/serializers.py +++ b/awx/main/serializers.py @@ -65,8 +65,8 @@ SUMMARIZABLE_FK_FIELDS = { 'job_template': DEFAULT_SUMMARY_FIELDS, 'last_job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',), 'last_job_host_summary': DEFAULT_SUMMARY_FIELDS + ('failed',), - 'last_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',), - 'current_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',), + 'last_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'), + 'current_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'), 'inventory_source': ('source', 'last_updated', 'status'), } @@ -723,7 +723,7 @@ class InventoryUpdateSerializer(BaseSerializer): fields = ('id', 'url', 'related', 'summary_fields', 'created', 'modified', 'inventory_source', 'status', 'failed', 'result_stdout', 'result_traceback', 'job_args', 'job_cwd', - 'job_env') + 'job_env', 'license_error') def get_related(self, obj): if obj is None: