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

Merge pull request #13648 from gamuniz/update_inventory_import

Browse Source 
Update inventory import to cancel on failure from cli.
This commit is contained in:
Gabriel Muniz
2023-03-13 21:34:05 -04:00
committed by GitHub
parent 7e88a735ad 3aba5b5a04
commit 11475590e7
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -851,6 +851,7 @@ class Command(BaseCommand):
logger.info('Updating inventory %d: %s' % (inventory.pk, inventory.name)) logger.info('Updating inventory %d: %s' % (inventory.pk, inventory.name))
# Create ad-hoc inventory source and inventory update objects # Create ad-hoc inventory source and inventory update objects
ee = get_default_execution_environment()
with ignore_inventory_computed_fields(): with ignore_inventory_computed_fields():
source = Command.get_source_absolute_path(raw_source) source = Command.get_source_absolute_path(raw_source)
@@ -860,14 +861,22 @@ class Command(BaseCommand):
source_path=os.path.abspath(source), source_path=os.path.abspath(source),
overwrite=bool(options.get('overwrite', False)), overwrite=bool(options.get('overwrite', False)),
overwrite_vars=bool(options.get('overwrite_vars', False)), overwrite_vars=bool(options.get('overwrite_vars', False)),
execution_environment=ee,
) )
inventory_update = inventory_source.create_inventory_update( inventory_update = inventory_source.create_inventory_update(
_eager_fields=dict(status='running', job_args=json.dumps(sys.argv), job_env=dict(os.environ.items()), job_cwd=os.getcwd()) _eager_fields=dict(
status='running', job_args=json.dumps(sys.argv), job_env=dict(os.environ.items()), job_cwd=os.getcwd(), execution_environment=ee
)
) )
data = AnsibleInventoryLoader(source=source, verbosity=verbosity).load() try:
data = AnsibleInventoryLoader(source=source, verbosity=verbosity).load()
logger.debug('Finished loading from source: %s', source)
logger.debug('Finished loading from source: %s', source) except SystemExit:
logger.debug("Error occurred while running ansible-inventory")
inventory_update.cancel()
sys.exit(1)
status, tb, exc = 'error', '', None status, tb, exc = 'error', '', None
try: try: