mirror of
https://github.com/ansible/awx.git
synced 2024-10-27 09:25:10 +03:00
add instance groups and queues to cluster tooling
This commit is contained in:
parent
20f0a83bec
commit
3cedcf22a9
4
Makefile
4
Makefile
@ -350,9 +350,11 @@ init:
|
||||
fi; \
|
||||
tower-manage register_instance --hostname=$(COMPOSE_HOST); \
|
||||
tower-manage register_queue --queuename=tower --hostnames=$(COMPOSE_HOST);\
|
||||
if [ "$(DOCKER_TOOLS_DIR)" == "tools/docker-isolated" ]; then \
|
||||
if [ "$(EXTRA_GROUP_QUEUES)" == "thepentagon" ]; then \
|
||||
tower-manage register_instance --hostname=isolated; \
|
||||
tower-manage register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \
|
||||
elif [ "$(EXTRA_GROUP_QUEUES)" != "" ]; then \
|
||||
tower-manage register_queue --queuename=$(EXTRA_GROUP_QUEUES) --hostnames=$(COMPOSE_HOST); \
|
||||
fi;
|
||||
|
||||
# Refresh development environment after pulling new code.
|
||||
|
@ -24,7 +24,7 @@ services:
|
||||
RABBITMQ_PASS: guest
|
||||
RABBITMQ_VHOST: /
|
||||
CELERY_RDB_HOST: 0.0.0.0
|
||||
DOCKER_TOOLS_DIR: tools/docker-compose
|
||||
EXTRA_GROUP_QUEUES: alpha
|
||||
volumes:
|
||||
- "../:/tower_devel"
|
||||
|
||||
@ -38,7 +38,7 @@ services:
|
||||
RABBITMQ_PASS: guest
|
||||
RABBITMQ_VHOST: /
|
||||
CELERY_RDB_HOST: 0.0.0.0
|
||||
DOCKER_TOOLS_DIR: tools/docker-compose
|
||||
EXTRA_GROUP_QUEUES: bravo
|
||||
volumes:
|
||||
- "../:/tower_devel"
|
||||
tower_3:
|
||||
@ -51,7 +51,7 @@ services:
|
||||
RABBITMQ_PASS: guest
|
||||
RABBITMQ_VHOST: /
|
||||
CELERY_RDB_HOST: 0.0.0.0
|
||||
DOCKER_TOOLS_DIR: tools/docker-compose
|
||||
EXTRA_GROUP_QUEUES: charlie
|
||||
volumes:
|
||||
- "../:/tower_devel"
|
||||
rabbitmq_1:
|
||||
|
@ -10,7 +10,7 @@ services:
|
||||
RABBITMQ_PASS: guest
|
||||
RABBITMQ_VHOST: /
|
||||
CELERY_RDB_HOST: 0.0.0.0
|
||||
DOCKER_TOOLS_DIR: tools/docker-compose
|
||||
EXTRA_GROUP_QUEUES:
|
||||
ports:
|
||||
- "8080:8080"
|
||||
- "5555:5555"
|
||||
|
@ -31,7 +31,7 @@ yes | cp -rf /tower_devel/tools/docker-compose/supervisor.conf /supervisor.conf
|
||||
# Tower bootstrapping
|
||||
make version_file
|
||||
make migrate
|
||||
make init DOCKER_TOOLS_DIR=${DOCKER_TOOLS_DIR}
|
||||
make init
|
||||
|
||||
mkdir -p /tower_devel/awx/public/static
|
||||
mkdir -p /tower_devel/awx/ui/static
|
||||
@ -41,5 +41,5 @@ mkdir -p /tower_devel/awx/ui/static
|
||||
if [ -f "/tower_devel/tools/docker-compose/use_dev_supervisor.txt" ]; then
|
||||
make supervisor
|
||||
else
|
||||
honcho start -f "${DOCKER_TOOLS_DIR}/Procfile"
|
||||
honcho start -f "tools/docker-compose/Procfile"
|
||||
fi
|
||||
|
@ -3,7 +3,7 @@ services:
|
||||
# Primary Tower Development Container link
|
||||
tower:
|
||||
environment:
|
||||
DOCKER_TOOLS_DIR: tools/docker-isolated
|
||||
EXTRA_GROUP_QUEUES: thepentagon
|
||||
links:
|
||||
- isolated
|
||||
# Isolated Rampart Container
|
||||
|
@ -1,7 +0,0 @@
|
||||
nginx: make nginx
|
||||
runworker: make runworker
|
||||
daphne: make daphne
|
||||
celeryd: make celeryd EXTRA_GROUP_QUEUES=thepentagon
|
||||
receiver: make receiver
|
||||
flower: make flower
|
||||
uwsgi: make uwsgi
|
Loading…
Reference in New Issue
Block a user