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

Merge pull request #245 from AlanCoding/fix_supervisor

Browse Source 
specify all group queues, get supervisor working
This commit is contained in:
Alan Rominger
2017-08-14 11:31:00 -04:00
committed by GitHub
parent 80a90beae8 2385f62311
commit dcfcfb6c7b
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -205,18 +205,19 @@ version_file:
python -c "import awx as awx; print awx.__version__" > /var/lib/awx/.awx_version python -c "import awx as awx; print awx.__version__" > /var/lib/awx/.awx_version
# Do any one-time init tasks. # Do any one-time init tasks.
comma := ,
init: init:
if [ "$(VENV_BASE)" ]; then \ if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \ . $(VENV_BASE)/awx/bin/activate; \
fi; \ fi; \
$(MANAGEMENT_COMMAND) provision_instance --hostname=$(COMPOSE_HOST); \ $(MANAGEMENT_COMMAND) provision_instance --hostname=$(COMPOSE_HOST); \
$(MANAGEMENT_COMMAND) register_queue --queuename=tower --hostnames=$(COMPOSE_HOST);\ $(MANAGEMENT_COMMAND) register_queue --queuename=tower --hostnames=$(COMPOSE_HOST);\
if [ "$(EXTRA_GROUP_QUEUES)" == "thepentagon" ]; then \ if [ "$(AWX_GROUP_QUEUES)" == "tower,thepentagon" ]; then \
$(MANAGEMENT_COMMAND) provision_instance --hostname=isolated; \ $(MANAGEMENT_COMMAND) provision_instance --hostname=isolated; \
$(MANAGEMENT_COMMAND) register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \ $(MANAGEMENT_COMMAND) register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \
$(MANAGEMENT_COMMAND) generate_isolated_key | ssh -o "StrictHostKeyChecking no" root@isolated 'cat > /root/.ssh/authorized_keys'; \ $(MANAGEMENT_COMMAND) generate_isolated_key | ssh -o "StrictHostKeyChecking no" root@isolated 'cat > /root/.ssh/authorized_keys'; \
elif [ "$(EXTRA_GROUP_QUEUES)" != "" ]; then \ elif [ "$(AWX_GROUP_QUEUES)" != "tower" ]; then \
$(MANAGEMENT_COMMAND) register_queue --queuename=$(EXTRA_GROUP_QUEUES) --hostnames=$(COMPOSE_HOST); \ $(MANAGEMENT_COMMAND) register_queue --queuename=$(firstword $(subst $(comma), ,$(AWX_GROUP_QUEUES))) --hostnames=$(COMPOSE_HOST); \
fi; fi;
# Refresh development environment after pulling new code. # Refresh development environment after pulling new code.
@@ -319,7 +320,7 @@ celeryd:
@if [ "$(VENV_BASE)" ]; then \ @if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \ . $(VENV_BASE)/awx/bin/activate; \
fi; \ fi; \
$(PYTHON) manage.py celeryd -l DEBUG -B -Ofair --autoreload --autoscale=100,4 --schedule=$(CELERY_SCHEDULE_FILE) -Q tower_scheduler,tower_broadcast_all,tower,$(COMPOSE_HOST),$(EXTRA_GROUP_QUEUES) -n celery@$(COMPOSE_HOST) $(PYTHON) manage.py celeryd -l DEBUG -B -Ofair --autoreload --autoscale=100,4 --schedule=$(CELERY_SCHEDULE_FILE) -Q tower_scheduler,tower_broadcast_all,$(COMPOSE_HOST),$(AWX_GROUP_QUEUES) -n celery@$(COMPOSE_HOST)
#$(PYTHON) manage.py celery multi show projects jobs default -l DEBUG -Q:projects projects -Q:jobs jobs -Q:default default -c:projects 1 -c:jobs 3 -c:default 3 -Ofair -B --schedule=$(CELERY_SCHEDULE_FILE) #$(PYTHON) manage.py celery multi show projects jobs default -l DEBUG -Q:projects projects -Q:jobs jobs -Q:default default -c:projects 1 -c:jobs 3 -c:default 3 -Ofair -B --schedule=$(CELERY_SCHEDULE_FILE)
# Run to start the zeromq callback receiver # Run to start the zeromq callback receiver

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
EXTRA_GROUP_QUEUES: alpha AWX_GROUP_QUEUES: alpha,tower
volumes: volumes:
- "../:/awx_devel" - "../:/awx_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
EXTRA_GROUP_QUEUES: bravo AWX_GROUP_QUEUES: bravo,tower
volumes: volumes:
- "../:/awx_devel" - "../:/awx_devel"
awx_3: awx_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
EXTRA_GROUP_QUEUES: charlie AWX_GROUP_QUEUES: charlie,tower
volumes: volumes:
- "../:/awx_devel" - "../:/awx_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
EXTRA_GROUP_QUEUES: AWX_GROUP_QUEUES: tower
ports: ports:
- "8080:8080" - "8080:8080"
- "5555:5555" - "5555:5555"

2
tools/docker-compose/supervisor.conf
View File

@@ -4,7 +4,7 @@ minfds = 4096
nodaemon=true nodaemon=true
[program:celeryd] [program:celeryd]
command = python manage.py celeryd -l DEBUG -B --autoreload --autoscale=20,3 --schedule=/celerybeat-schedule -Q tower_scheduler,tower_broadcast_all,tower,%(ENV_EXTRA_GROUP_QUEUES)s,%(ENV_HOSTNAME)s -n celery@%(ENV_HOSTNAME)s command = python manage.py celeryd -l DEBUG -B --autoreload --autoscale=20,3 --schedule=/celerybeat-schedule -Q tower_scheduler,tower_broadcast_all,%(ENV_AWX_GROUP_QUEUES)s,%(ENV_HOSTNAME)s -n celery@%(ENV_HOSTNAME)s
autostart = true autostart = true
autorestart = true autorestart = true
redirect_stderr=true redirect_stderr=true

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

@@ -3,7 +3,7 @@ services:
# Primary Tower Development Container link # Primary Tower Development Container link
awx: awx:
environment: environment:
EXTRA_GROUP_QUEUES: thepentagon AWX_GROUP_QUEUES: tower,thepentagon
links: links:
- isolated - isolated
# Isolated Rampart Container # Isolated Rampart Container