External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-10 20:49:24 -02:30
Code Issues Packages Projects Releases Wiki Activity

add instance groups and queues to cluster tooling

Browse Source
This commit is contained in:
AlanCoding
2017-06-22 08:37:37 -04:00
parent 20f0a83bec
commit 3cedcf22a9
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -350,9 +350,11 @@ init:
fi; \ fi; \
tower-manage register_instance --hostname=$(COMPOSE_HOST); \ tower-manage register_instance --hostname=$(COMPOSE_HOST); \
tower-manage register_queue --queuename=tower --hostnames=$(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_instance --hostname=isolated; \
tower-manage register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \ 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; fi;
# Refresh development environment after pulling new code. # Refresh development environment after pulling new code.

6
tools/docker-compose-cluster.yml
View File

@@ -24,7 +24,7 @@ services:
RABBITMQ_PASS: guest RABBITMQ_PASS: guest
RABBITMQ_VHOST: / RABBITMQ_VHOST: /
CELERY_RDB_HOST: 0.0.0.0 CELERY_RDB_HOST: 0.0.0.0
DOCKER_TOOLS_DIR: tools/docker-compose EXTRA_GROUP_QUEUES: alpha
volumes: volumes:
- "../:/tower_devel" - "../:/tower_devel"
@@ -38,7 +38,7 @@ services:
RABBITMQ_PASS: guest RABBITMQ_PASS: guest
RABBITMQ_VHOST: / RABBITMQ_VHOST: /
CELERY_RDB_HOST: 0.0.0.0 CELERY_RDB_HOST: 0.0.0.0
DOCKER_TOOLS_DIR: tools/docker-compose EXTRA_GROUP_QUEUES: bravo
volumes: volumes:
- "../:/tower_devel" - "../:/tower_devel"
tower_3: tower_3:
@@ -51,7 +51,7 @@ services:
RABBITMQ_PASS: guest RABBITMQ_PASS: guest
RABBITMQ_VHOST: / RABBITMQ_VHOST: /
CELERY_RDB_HOST: 0.0.0.0 CELERY_RDB_HOST: 0.0.0.0
DOCKER_TOOLS_DIR: tools/docker-compose EXTRA_GROUP_QUEUES: charlie
volumes: volumes:
- "../:/tower_devel" - "../:/tower_devel"
rabbitmq_1: rabbitmq_1:

2
tools/docker-compose.yml
View File

@@ -10,7 +10,7 @@ services:
RABBITMQ_PASS: guest RABBITMQ_PASS: guest
RABBITMQ_VHOST: / RABBITMQ_VHOST: /
CELERY_RDB_HOST: 0.0.0.0 CELERY_RDB_HOST: 0.0.0.0
DOCKER_TOOLS_DIR: tools/docker-compose EXTRA_GROUP_QUEUES:
ports: ports:
- "8080:8080" - "8080:8080"
- "5555:5555" - "5555:5555"

4
tools/docker-compose/start_development.sh
View File

@@ -31,7 +31,7 @@ yes | cp -rf /tower_devel/tools/docker-compose/supervisor.conf /supervisor.conf
# Tower bootstrapping # Tower bootstrapping
make version_file make version_file
make migrate make migrate
make init DOCKER_TOOLS_DIR=${DOCKER_TOOLS_DIR} make init
mkdir -p /tower_devel/awx/public/static mkdir -p /tower_devel/awx/public/static
mkdir -p /tower_devel/awx/ui/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 if [ -f "/tower_devel/tools/docker-compose/use_dev_supervisor.txt" ]; then
make supervisor make supervisor
else else
honcho start -f "${DOCKER_TOOLS_DIR}/Procfile" honcho start -f "tools/docker-compose/Procfile"
fi fi

2
tools/docker-isolated-override.yml
View File

@@ -3,7 +3,7 @@ services:
# Primary Tower Development Container link # Primary Tower Development Container link
tower: tower:
environment: environment:
DOCKER_TOOLS_DIR: tools/docker-isolated EXTRA_GROUP_QUEUES: thepentagon
links: links:
- isolated - isolated
# Isolated Rampart Container # Isolated Rampart Container

7
tools/docker-isolated/Procfile
View File

@@ -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