From 7b1edda368f82eeaca13bf75f22eada0b65b0a36 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 4 Mar 2021 15:04:36 -0500 Subject: [PATCH] support receptor in multi cluster nodes --- Makefile | 2 +- .../ansible/roles/sources/templates/docker-compose.yml.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a68ab74c46..a06c32c2de 100644 --- a/Makefile +++ b/Makefile @@ -540,7 +540,7 @@ docker-compose-sources: ansible-playbook -i tools/docker-compose/inventory tools/docker-compose/ansible/sources.yml \ -e awx_image=$(DEV_DOCKER_TAG_BASE)/awx_devel \ -e awx_image_tag=$(COMPOSE_TAG) \ - -e cluster_node_count=$(CLUSER_NODE_COUNT) + -e cluster_node_count=$(CLUSTER_NODE_COUNT) docker-compose: docker-auth awx/projects docker-compose-sources docker-compose -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_UP_OPTS) up diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index 7d724c82f4..ccc42d2b0e 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -38,10 +38,10 @@ services: - "../../docker-compose/_sources/local_settings.py:/etc/tower/conf.d/local_settings.py" - "../../docker-compose/_sources/SECRET_KEY:/etc/tower/SECRET_KEY" - "../../docker-compose/receptor.conf:/etc/receptor/receptor.conf" - - "receptor:/var/run/receptor/" - "/sys/fs/cgroup:/sys/fs/cgroup" - "~/.kube/config:/var/lib/awx/.kube/config" - "redis_socket_{{ container_postfix }}:/var/run/redis/:rw" + - "receptor_{{ container_postfix }}:/var/run/receptor/" privileged: true tty: true ports: @@ -93,8 +93,8 @@ services: - "awx_db:/var/lib/postgresql/data" volumes: awx_db: - receptor: {% for i in range(cluster_node_count|int) -%} {% set container_postfix = loop.index %} + receptor_{{ container_postfix }}: redis_socket_{{ container_postfix }}: {% endfor -%}