diff options
| author | Shane McDonald <me@shanemcd.com> | 2022-11-16 00:29:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-16 00:29:08 +0100 |
| commit | 925e055bb30c602b749715899ed40a6cbd4ecd74 (patch) | |
| tree | 3a15c455004be62d597ec775112da6400409e08a | |
| parent | Bulk save facts, and move to before status change (#12998) (diff) | |
| parent | Default to 0 execution nodes in dev env (diff) | |
| download | awx-925e055bb30c602b749715899ed40a6cbd4ecd74.tar.xz awx-925e055bb30c602b749715899ed40a6cbd4ecd74.zip | |
Merge pull request #13199 from shanemcd/default-no-external-nodes
Default to 0 execution nodes in dev env
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/tasks/main.yml | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -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: |