diff options
| author | AlanCoding <arominge@redhat.com> | 2017-06-22 14:37:37 +0200 |
|---|---|---|
| committer | AlanCoding <arominge@redhat.com> | 2017-06-22 16:40:58 +0200 |
| commit | 3cedcf22a9ef3e06e8b55dd4ae98394a777899c6 (patch) | |
| tree | 756f18d8a81e7b378754d6e609fdf50a5f85d037 /Makefile | |
| parent | Merge pull request #6682 from AlanCoding/isolated_execution (diff) | |
| download | awx-3cedcf22a9ef3e06e8b55dd4ae98394a777899c6.tar.xz awx-3cedcf22a9ef3e06e8b55dd4ae98394a777899c6.zip | |
add instance groups and queues to cluster tooling
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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. |