diff options
| author | Matthew Jones <matburt@redhat.com> | 2016-09-06 15:47:11 +0200 |
|---|---|---|
| committer | Matthew Jones <matburt@redhat.com> | 2016-09-06 15:47:11 +0200 |
| commit | 27ab6705e7a810e4076f146ead7fbe9641038418 (patch) | |
| tree | aab68084396ab05c96d75fdec00b2801ff4da7b5 /tools | |
| parent | fix flake8 (diff) | |
| download | awx-27ab6705e7a810e4076f146ead7fbe9641038418.tar.xz awx-27ab6705e7a810e4076f146ead7fbe9641038418.zip | |
Merge branch 'ramparts_and_ha' into devel
* ramparts_and_ha:
Removing qpid from deb packaging
Refactor rabbitmq role
Integrate memcached into setup playbook
Remove mongodb shutdown task
Remove dependency on erlang_sd_notify
Add initial rabbitmq role
Initial rabbitmq setup playbook integration
Update development environment for rabbit
Replace qpid with rabbitmq
Remove redis role from setup playbook
Update qpid packaging, remove migrations
Integrate packaging for qpid/memcached
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose.yml | 7 | ||||
| -rwxr-xr-x | tools/docker-compose/start_development.sh | 2 |
2 files changed, 4 insertions, 5 deletions
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 |