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

Merge branch 'purge_ansible_name' into release_3.2.0

Browse Source 
* purge_ansible_name:
  Remove ansible reference from dev PKG-INFO
  Add back in PRIVILEGE_ESCALATION_METHODS inadvertantly removed
  Add awx_ and AWX_ environment vars and extra_vars alongside Tower
  Refactor some tower periodic tasks to label as awx
  Refactor Notification backend for tower -> awx
  Refactor fact cache plugin from tower -> awx
  Rename tower display plugins to awx display
  Mass rename from ansible_(awx|tower) -> (awx|tower)
This commit is contained in:
Matthew Jones
2017-07-26 23:06:55 -04:00
parent d00ccfc442 7231537841
commit 2b1bcc23be
62 changed files with 126 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/settings/defaults.py
View File

@@ -448,7 +448,7 @@ CELERY_ROUTES = {'awx.main.scheduler.tasks.run_task_manager': {'queue': 'tower',
CELERYBEAT_SCHEDULE = {
'tower_scheduler': {
'task': 'awx.main.tasks.tower_periodic_scheduler',
'task': 'awx.main.tasks.awx_periodic_scheduler',
'schedule': timedelta(seconds=30),
'options': {'expires': 20,}
},

2
awx/settings/development.py
View File

@@ -126,7 +126,7 @@ CELERY_ROUTES['awx.main.tasks.cluster_node_heartbeat'] = {'queue': CLUSTER_HOST_
# Production only runs this schedule on controlling nodes
# but development will just run it on all nodes
CELERYBEAT_SCHEDULE['isolated_heartbeat'] = {
'task': 'awx.main.tasks.tower_isolated_heartbeat',
'task': 'awx.main.tasks.awx_isolated_heartbeat',
'schedule': timedelta(seconds = AWX_ISOLATED_PERIODIC_CHECK),
'options': {'expires': AWX_ISOLATED_PERIODIC_CHECK * 2,}
}