Merge pull request #245 from AlanCoding/fix_supervisor

specify all group queues, get supervisor working

tools/docker-compose-cluster.yml

@@ -24,7 +24,7 @@ services:
       RABBITMQ_PASS: guest
       RABBITMQ_VHOST: /
       CELERY_RDB_HOST: 0.0.0.0
-      EXTRA_GROUP_QUEUES: alpha
+      AWX_GROUP_QUEUES: alpha,tower
     volumes:
       - "../:/awx_devel"
 
@@ -38,7 +38,7 @@ services:
       RABBITMQ_PASS: guest
       RABBITMQ_VHOST: /
       CELERY_RDB_HOST: 0.0.0.0
-      EXTRA_GROUP_QUEUES: bravo
+      AWX_GROUP_QUEUES: bravo,tower
     volumes:
       - "../:/awx_devel"
   awx_3:
@@ -51,7 +51,7 @@ services:
       RABBITMQ_PASS: guest
       RABBITMQ_VHOST: /
       CELERY_RDB_HOST: 0.0.0.0
-      EXTRA_GROUP_QUEUES: charlie
+      AWX_GROUP_QUEUES: charlie,tower
     volumes:
       - "../:/awx_devel"
   rabbitmq_1:

tools/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       RABBITMQ_PASS: guest
       RABBITMQ_VHOST: /
       CELERY_RDB_HOST: 0.0.0.0
-      EXTRA_GROUP_QUEUES: 
+      AWX_GROUP_QUEUES: tower
     ports:
       - "8080:8080"
       - "5555:5555"

tools/docker-compose/supervisor.conf

@@ -4,7 +4,7 @@ minfds = 4096
 nodaemon=true
 
 [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
 autorestart = true
 redirect_stderr=true

tools/docker-isolated-override.yml

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