From 968c316c0cd3f39d8ae56b7df33176439d9db3e8 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 15 Nov 2022 15:22:05 -0500 Subject: [PATCH] Default to 0 execution nodes in dev env --- Makefile | 4 ++-- tools/docker-compose/ansible/roles/sources/tasks/main.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cb8b86cdac..830317bb2f 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ virtualenv_awx: fi; \ fi -## Install third-party requirements needed for AWX's environment. +## Install third-party requirements needed for AWX's environment. # this does not use system site packages intentionally requirements_awx: virtualenv_awx if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \ @@ -452,7 +452,7 @@ awx/projects: COMPOSE_UP_OPTS ?= COMPOSE_OPTS ?= CONTROL_PLANE_NODE_COUNT ?= 1 -EXECUTION_NODE_COUNT ?= 2 +EXECUTION_NODE_COUNT ?= 0 MINIKUBE_CONTAINER_GROUP ?= false MINIKUBE_SETUP ?= false # if false, run minikube separately EXTRA_SOURCES_ANSIBLE_OPTS ?= diff --git a/tools/docker-compose/ansible/roles/sources/tasks/main.yml b/tools/docker-compose/ansible/roles/sources/tasks/main.yml index b6dd95aedb..5787ab1943 100644 --- a/tools/docker-compose/ansible/roles/sources/tasks/main.yml +++ b/tools/docker-compose/ansible/roles/sources/tasks/main.yml @@ -128,6 +128,8 @@ src: "receptor-hop.conf.j2" dest: "{{ sources_dest }}/receptor/receptor-hop.conf" mode: '0600' + when: + - execution_node_count | int > 0 - name: Render Receptor Worker Config(s) template: