From 3cedcf22a9ef3e06e8b55dd4ae98394a777899c6 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 22 Jun 2017 08:37:37 -0400
Subject: [PATCH] add instance groups and queues to cluster tooling

---
 Makefile                                  | 4 +++-
 tools/docker-compose-cluster.yml          | 6 +++---
 tools/docker-compose.yml                  | 2 +-
 tools/docker-compose/start_development.sh | 4 ++--
 tools/docker-isolated-override.yml        | 2 +-
 tools/docker-isolated/Procfile            | 7 -------
 6 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 tools/docker-isolated/Procfile

diff --git a/Makefile b/Makefile
index c2a40cc99f..4412ba32d1 100644
--- a/Makefile
+++ b/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.
diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml
index 7ae2d4f28b..c6521d7011 100644
--- a/tools/docker-compose-cluster.yml
+++ b/tools/docker-compose-cluster.yml
@@ -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:
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index c7c209355c..e819d874c8 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -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"
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 3246164806..f6296d0954 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -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
diff --git a/tools/docker-isolated-override.yml b/tools/docker-isolated-override.yml
index ed2ef46971..2e2613fb82 100644
--- a/tools/docker-isolated-override.yml
+++ b/tools/docker-isolated-override.yml
@@ -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
diff --git a/tools/docker-isolated/Procfile b/tools/docker-isolated/Procfile
deleted file mode 100644
index 42cf77b7d5..0000000000
--- a/tools/docker-isolated/Procfile
+++ /dev/null
@@ -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