Merge pull request #58 from chrismeyersfsu/refactor-settings

Refactor settings

awx/main/tests/tasks.py

@@ -1257,6 +1257,8 @@ class RunJobTest(BaseCeleryTest):
         self.assertEqual(job.processed_hosts.count(), 1)
 
     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)
         job_template = self.create_test_job_template()
         job = self.create_test_job(job_template=job_template)

awx/settings/development.py

@@ -23,6 +23,9 @@ if 'celeryd' in sys.argv:
 CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5557"
 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.
 try:
     import django_jenkins

awx/settings/local_settings.py.example

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