From 82419e468731c3777245813183df1d71e1e8278f Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Wed, 14 Feb 2018 19:29:49 +0100 Subject: [PATCH] inject THEMES_DIRECTORY in hobo-agent commands environment (#21856) --- roles/hobo-agent/templates/hobo-agent-supervisor.j2 | 2 +- roles/hobo-agent/templates/hobo-agent.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/hobo-agent/templates/hobo-agent-supervisor.j2 b/roles/hobo-agent/templates/hobo-agent-supervisor.j2 index 1b47298..941dfb1 100644 --- a/roles/hobo-agent/templates/hobo-agent-supervisor.j2 +++ b/roles/hobo-agent/templates/hobo-agent-supervisor.j2 @@ -1,7 +1,7 @@ [program:{{agent_dash_name}}] ; Concurrency set to 1 because there is no lock around calls to hobo_notify command={{venv_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1 -environment=HOBO_AGENT_SETTINGS_FILE="{{agent_settings}}" +environment=HOBO_AGENT_SETTINGS_FILE={{agent_settings}},THEMES_DIRECTORY={{themes_dir}} process_name={{agent_dash_name}} user={{user}} numprocs=1 diff --git a/roles/hobo-agent/templates/hobo-agent.j2 b/roles/hobo-agent/templates/hobo-agent.j2 index 0020e1d..2ac8c05 100644 --- a/roles/hobo-agent/templates/hobo-agent.j2 +++ b/roles/hobo-agent/templates/hobo-agent.j2 @@ -1,2 +1,2 @@ #!/bin/bash -HOBO_AGENT_SETTINGS_FILE="{{agent_settings}}" {{venv_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1 \ No newline at end of file +HOBO_AGENT_SETTINGS_FILE={{agent_settings}} THEMES_DIRECTORY={{themes_dir}} {{venv_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1 -- 2.15.1