diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 18e44cdc72..97157e4acd 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -351,7 +351,7 @@ CELERYBEAT_SCHEDULE = { }, } -# Use Redis as cache backend (except when testing). +# Django Caching Configuration if is_testing(): CACHES = { 'default': { @@ -361,8 +361,8 @@ if is_testing(): else: CACHES = { 'default': { - 'BACKEND': 'redis_cache.RedisCache', - 'LOCATION': BROKER_URL, + 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', + 'LOCATION': 'memcached:11211', }, } diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose index e4b47f2ebc..c85d89cb21 100644 --- a/awx/settings/local_settings.py.docker_compose +++ b/awx/settings/local_settings.py.docker_compose @@ -48,23 +48,8 @@ if is_testing(sys.argv): MONGO_DB = 'system_tracking_test' -# Django Caching Configuration -if is_testing(): - CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - }, - } -else: - CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': 'memcached:11211', - }, - } - # Celery AMQP configuration. -BROKER_URL = 'qpid://qpid:5672' +BROKER_URL = 'amqp://guest:guest@rabbitmq//' # Mongo host configuration MONGO_HOST = NotImplemented diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 34176e14ed..1a3ba9e7f3 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -21,8 +21,6 @@ django-extensions==1.5.9 git+https://github.com/chrismeyersfsu/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield django-polymorphic==0.7.2 django-radius==1.0.0 -# NOTE: Remove when we transition packaging -django-redis-cache==1.6.5 djangorestframework==3.3.2 djangorestframework-yaml==1.0.2 django-split-settings==0.1.1 @@ -110,13 +108,10 @@ python-troveclient==1.4.0 pytz==2015.7 PyYAML==3.11 pyzmq==14.5.0 -qpid-python==0.32.1 rackspace-auth-openstack==1.3 rackspace-novaclient==1.5 rax-default-network-flags-python-novaclient-ext==0.3.2 rax-scheduled-images-python-novaclient-ext==0.3.1 -# NOTE: Remove this when we transition packaging -redis==2.10.3 requests-oauthlib==0.5.0 requests==2.9.1 requestsexceptions==1.1.1 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index f58cda659e..5fa57df995 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -10,4 +10,3 @@ pytest-cov pytest-django pytest-pythonpath pytest-mock -qpid-tools diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index 638926b727..73a5c12bb9 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -9,7 +9,7 @@ services: links: - postgres - memcached - - qpid + - rabbitmq # - sync # volumes_from: # - sync @@ -23,9 +23,8 @@ services: memcached: image: memcached:alpine - qpid: - image: fedora/qpid:latest - entrypoint: qpidd --auth=no + rabbitmq: + image: rabbitmq:3-management # Source Code Synchronization Container # sync: diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index b75ef757c1..96812974fa 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/start_development.sh @@ -4,7 +4,7 @@ set +x # Wait for the databases to come up ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=memcached port=11211" all -ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=qpid port=5672" all +ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=rabbitmq port=5672" all # In case Tower in the container wants to connect to itself, use "docker exec" to attach to the container otherwise # TODO: FIX