From f7ba1bd6c2929daff3c2c2f62ea46c6e63698de7 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 6 May 2020 14:06:56 -0500 Subject: [PATCH] Pass -f to nodepool to run in foreground We don't want to run it as a daemon now that we're passing logging config to nodepool. Pass -f - since that's what the Dockerfile does. Change-Id: I87b4210ee7e5a622a34944c6345008082e75145b --- .../roles/nodepool-builder/templates/docker-compose.yaml.j2 | 2 +- .../roles/nodepool-launcher/templates/docker-compose.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 b/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 index 41d5eac840..52ca0a9485 100644 --- a/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 @@ -5,7 +5,7 @@ services: user: nodepool network_mode: host restart: always - command: nodepool-builder -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/builder-logging.conf + command: nodepool-builder -f -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/builder-logging.conf privileged: true diff --git a/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 b/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 index 1cee0cae60..e6f9a58d58 100644 --- a/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 @@ -5,7 +5,7 @@ services: user: nodepool network_mode: host restart: always - command: nodepool-launcher -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/launcher-logging.conf + command: nodepool-launcher -f -c /etc/nodepool/nodepool.yaml -l /etc/nodepool/launcher-logging.conf environment: - DEBUG=1