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

Updates to Makefile and CONTRIBUTING

Browse Source 
...for the RabbitMQ to Redis changeout.
This commit is contained in:
Luke Sneeringer
2014-11-11 14:18:39 -06:00
parent 3a8c32444b
commit 1edd8f9c0a
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -152,13 +152,20 @@ develop:
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \
pip uninstall -y awx; \ pip uninstall -y awx; \
$(PYTHON) setup.py develop; \ $(PYTHON) setup.py develop; \
awx-manage register_instance --primary --ip-address=127.0.0.1; \
else \ else \
sudo pip uninstall -y awx; \ sudo pip uninstall -y awx; \
sudo $(PYTHON) setup.py develop; \ sudo $(PYTHON) setup.py develop; \
sudo awx-manage register_instance --primary --ip-address=127.0.0.1; \ sudo awx-manage register_instance --primary --ip-address=127.0.0.1; \
fi fi
# Do any one-time init tasks.
init:
@if [ "$(VIRTUAL_ENV)" ]; then \
awx-manage register_instance --primary --ip-address=127.0.0.1; \
else \
sudo awx-manage register_instance --primary --ip-address=127.0.0.1; \
fi
# Refresh development environment after pulling new code. # Refresh development environment after pulling new code.
refresh: clean requirements develop migrate refresh: clean requirements develop migrate

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

@@ -9,6 +9,7 @@ import os
import shutil import shutil
import subprocess import subprocess
import tempfile import tempfile
import unittest
# Django # Django
from django.conf import settings from django.conf import settings
@@ -1340,6 +1341,8 @@ class RunJobTest(BaseCeleryTest):
self.check_job_result(job, 'successful') self.check_job_result(job, 'successful')
self.check_job_events(job, 'ok', 1, 3, has_roles=True) self.check_job_events(job, 'ok', 1, 3, has_roles=True)
@unittest.skipUnless(settings.BROKER_URL == 'redis://localhost/',
'Non-default Redis setup.')
def test_run_job_with_proot(self): def test_run_job_with_proot(self):
# Only run test if proot is installed # Only run test if proot is installed
cmd = [getattr(settings, 'AWX_PROOT_CMD', 'proot'), '--version'] cmd = [getattr(settings, 'AWX_PROOT_CMD', 'proot'), '--version']

2
awx/settings/defaults.py
View File

@@ -274,7 +274,7 @@ SOUTH_TESTS_MIGRATE = False
import djcelery import djcelery
djcelery.setup_loader() djcelery.setup_loader()
BROKER_URL = 'django://' BROKER_URL = 'redis://localhost/'
CELERY_TASK_SERIALIZER = 'json' CELERY_TASK_SERIALIZER = 'json'
CELERY_RESULT_SERIALIZER = 'json' CELERY_RESULT_SERIALIZER = 'json'
CELERY_ACCEPT_CONTENT = ['json'] CELERY_ACCEPT_CONTENT = ['json']

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

@@ -44,7 +44,7 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'test':
} }
# Celery AMQP configuration. # Celery AMQP configuration.
BROKER_URL = 'amqp://awx-dev:AWXsome1@localhost:5672/awx-dev' BROKER_URL = 'redis://localhost/'
# Set True to enable additional logging from the job_event_callback plugin # Set True to enable additional logging from the job_event_callback plugin
JOB_CALLBACK_DEBUG = False JOB_CALLBACK_DEBUG = False