From ae4f8c7134b825e5533fa77717828104874eb312 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 22 Mar 2019 20:39:09 -0400 Subject: [PATCH] Pass secure.conf by default to nodepool services This file is used to contain information like zookeeper auth, by default we should enable it for our systemd integration. Change-Id: I9dec8aef178e4faf9038b49471d1534bbce22574 Signed-off-by: Paul Belanger --- templates/etc/systemd/system/nodepool-builder.service | 2 +- templates/etc/systemd/system/nodepool-launcher.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/etc/systemd/system/nodepool-builder.service b/templates/etc/systemd/system/nodepool-builder.service index 8fbf6ed..ea0d350 100644 --- a/templates/etc/systemd/system/nodepool-builder.service +++ b/templates/etc/systemd/system/nodepool-builder.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple # Options to pass to nodepool-builder. -Environment="ARGS=-l /etc/nodepool/builder-logging.conf" +Environment="ARGS=-l /etc/nodepool/builder-logging.conf -s /etc/nodepool/secure.conf" Group=nodepool User=nodepool ExecStart={{ nodepool_pip_virtualenv | default('/usr/local') }}/bin/nodepool-builder -d $ARGS diff --git a/templates/etc/systemd/system/nodepool-launcher.service b/templates/etc/systemd/system/nodepool-launcher.service index f3ff05c..0370ed5 100644 --- a/templates/etc/systemd/system/nodepool-launcher.service +++ b/templates/etc/systemd/system/nodepool-launcher.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple # Options to pass to nodepool-launcher. -Environment="ARGS=-l /etc/nodepool/launcher-logging.conf --no-webapp" +Environment="ARGS=-l /etc/nodepool/launcher-logging.conf -s /etc/nodepool/secure.conf --no-webapp" Group=nodepool User=nodepool ExecStart={{ nodepool_pip_virtualenv | default('/usr/local') }}/bin/nodepool-launcher -d $ARGS