shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

fix up scm inventory updates

Browse Source 
* implicit project updates inherit inv update instance group
* added needed settings for SCM group filter and others
This commit is contained in:
Chris Meyers 2017-06-07 14:33:13 -04:00
parent d323a01f5e
commit ba5f553f0c
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/tasks.py
View File

@ -1852,6 +1852,7 @@ class RunInventoryUpdate(BaseTask):
_eager_fields=dict( _eager_fields=dict(
job_type='run', job_type='run',
status='running', status='running',
instance_group = job.instance_group,
celery_task_id=request_id)) celery_task_id=request_id))
# associate the inventory update before calling run() so that a # associate the inventory update before calling run() so that a
# cancel() call on the inventory update can cancel the project update # cancel() call on the inventory update can cancel the project update

10
awx/settings/defaults.py
View File

@ -822,6 +822,16 @@ CUSTOM_HOST_FILTER = r'^.+$'
CUSTOM_EXCLUDE_EMPTY_GROUPS = True CUSTOM_EXCLUDE_EMPTY_GROUPS = True
#CUSTOM_INSTANCE_ID_VAR = #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 -- # -- Activity Stream --
# --------------------- # ---------------------