diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose index e4b47f2ebc..e1169e4291 100644 --- a/awx/settings/local_settings.py.docker_compose +++ b/awx/settings/local_settings.py.docker_compose @@ -64,7 +64,7 @@ else: } # 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 ea7376531e..1a3ba9e7f3 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -108,7 +108,6 @@ 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 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index d848638306..d7906ce28f 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