diff --git a/awx/main/tasks.py b/awx/main/tasks.py index d206711cc1..67fe93fc73 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1852,6 +1852,7 @@ class RunInventoryUpdate(BaseTask): _eager_fields=dict( job_type='run', status='running', + instance_group = job.instance_group, celery_task_id=request_id)) # associate the inventory update before calling run() so that a # cancel() call on the inventory update can cancel the project update diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index e4a6d42ad1..cad712bc22 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -822,6 +822,16 @@ CUSTOM_HOST_FILTER = r'^.+$' CUSTOM_EXCLUDE_EMPTY_GROUPS = True #CUSTOM_INSTANCE_ID_VAR = +# --------------------- +# ----- SCM ----- +# --------------------- +#CUSTOM_ENABLED_VAR = +#CUSTOM_ENABLED_VALUE = +SCM_GROUP_FILTER = r'^.+$' +SCM_HOST_FILTER = r'^.+$' +SCM_EXCLUDE_EMPTY_GROUPS = True +#CUSTOM_INSTANCE_ID_VAR = + # --------------------- # -- Activity Stream -- # ---------------------