External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 08:48:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3717 from AlanCoding/flake8_31

Browse Source 
flake8 fixes
This commit is contained in:
Alan Rominger
2016-10-14 10:08:16 -04:00
committed by GitHub
parent 1979d63c25 8d89d68d5e
commit 330d3d3f6c
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/asgi.py
View File

@@ -6,9 +6,10 @@ from awx import __version__ as tower_version
# Prepare the AWX environment. # Prepare the AWX environment.
from awx import prepare_env, MODE from awx import prepare_env, MODE
prepare_env() prepare_env() # NOQA
from django.core.wsgi import get_wsgi_application # NOQA from django.core.wsgi import get_wsgi_application # NOQA
from channels.asgi import get_channel_layer
""" """
ASGI config for AWX project. ASGI config for AWX project.
@@ -29,7 +30,6 @@ if MODE == 'production':
logger.error("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.") logger.error("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.")
raise Exception("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.") raise Exception("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.")
from channels.asgi import get_channel_layer
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "awx.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "awx.settings")

2
awx/main/management/commands/deprovision_node.py
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2016 Ansible, Inc. # Copyright (c) 2016 Ansible, Inc.
# All Rights Reserved # All Rights Reserved
from django.core.management.base import CommandError, BaseCommand from django.core.management.base import BaseCommand
from optparse import make_option from optparse import make_option
from awx.main.models import Instance from awx.main.models import Instance

2
awx/main/management/commands/register_instance.py
View File

@@ -5,7 +5,7 @@ from awx.main.models import Instance
from django.conf import settings from django.conf import settings
from optparse import make_option from optparse import make_option
from django.core.management.base import CommandError, BaseCommand from django.core.management.base import BaseCommand
class Command(BaseCommand): class Command(BaseCommand):
""" """

1
awx/main/tests/functional/api/test_settings.py
View File

@@ -3,7 +3,6 @@
# Python # Python
import pytest import pytest
import mock
# Django # Django
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse

29
awx/settings/defaults.py
View File

@@ -361,21 +361,20 @@ CELERY_QUEUES = (
Broadcast('projects'), Broadcast('projects'),
) )
CELERY_ROUTES = {'awx.main.tasks.run_job': {'queue': 'jobs', CELERY_ROUTES = {'awx.main.tasks.run_job': {'queue': 'jobs',
'routing_key': 'jobs'}, 'routing_key': 'jobs'},
'awx.main.tasks.run_project_update': {'queue': 'projects'}, 'awx.main.tasks.run_project_update': {'queue': 'projects'},
'awx.main.tasks.run_inventory_update': {'queue': 'jobs', 'awx.main.tasks.run_inventory_update': {'queue': 'jobs',
'routing_key': 'jobs'}, 'routing_key': 'jobs'},
'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs', 'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs',
'routing_key': 'jobs'}, 'routing_key': 'jobs'},
'awx.main.tasks.run_system_job': {'queue': 'jobs', 'awx.main.tasks.run_system_job': {'queue': 'jobs',
'routing_key': 'jobs'}, 'routing_key': 'jobs'},
'awx.main.scheduler.tasks.run_job_launch': {'queue': 'scheduler', 'awx.main.scheduler.tasks.run_job_launch': {'queue': 'scheduler',
'routing_key': 'scheduler.job.launch'}, 'routing_key': 'scheduler.job.launch'},
'awx.main.scheduler.tasks.run_job_complete': {'queue': 'scheduler', 'awx.main.scheduler.tasks.run_job_complete': {'queue': 'scheduler',
'routing_key': 'scheduler.job.complete'}, 'routing_key': 'scheduler.job.complete'},
'awx.main.tasks.cluster_node_heartbeat': {'queue': 'default', 'awx.main.tasks.cluster_node_heartbeat': {'queue': 'default',
'routing_key': 'cluster.heartbeat'}, 'routing_key': 'cluster.heartbeat'},}
}
CELERYBEAT_SCHEDULE = { CELERYBEAT_SCHEDULE = {
'tower_scheduler': { 'tower_scheduler': {