External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from chrismeyersfsu/refactor-settings

Browse Source 
Refactor settings
This commit is contained in:
Chris Meyers
2015-02-03 12:08:30 -05:00
parent 6d99ed2774 981eeb3c88
commit 766d972d8c
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tests/tasks.py
View File

@@ -1257,6 +1257,8 @@ class RunJobTest(BaseCeleryTest):
self.assertEqual(job.processed_hosts.count(), 1) self.assertEqual(job.processed_hosts.count(), 1)
def test_run_async_job_that_fails(self): def test_run_async_job_that_fails(self):
# FIXME: We are not sure why proot needs to be disabled on this test
settings.AWX_PROOT_ENABLED = False
self.create_test_project(TEST_ASYNC_FAIL_PLAYBOOK) self.create_test_project(TEST_ASYNC_FAIL_PLAYBOOK)
job_template = self.create_test_job_template() job_template = self.create_test_job_template()
job = self.create_test_job(job_template=job_template) job = self.create_test_job(job_template=job_template)

3
awx/settings/development.py
View File

@@ -23,6 +23,9 @@ if 'celeryd' in sys.argv:
CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5557" CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5557"
CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc" CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc"
# Enable PROOT for tower-qa integration tests
AWX_PROOT_ENABLED = True
# Use Django-Jenkins if installed. Only run tests for awx.main app. # Use Django-Jenkins if installed. Only run tests for awx.main app.
try: try:
import django_jenkins import django_jenkins

2
awx/settings/local_settings.py.example
View File

@@ -25,7 +25,7 @@ DATABASES = {
'NAME': 'awx-dev', 'NAME': 'awx-dev',
'USER': 'awx-dev', 'USER': 'awx-dev',
'PASSWORD': 'AWXsome1', 'PASSWORD': 'AWXsome1',
'HOST': '', 'HOST': 'localhost',
'PORT': '', 'PORT': '',
} }
} }