From 9c20abc56479271e02d9ada5df3e24147ff69670 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 13 Mar 2019 19:57:38 +0100 Subject: [PATCH] Fix some services (st2actionrunner, st2scheduler, st2workflowengine) to correctly use default config file from /etc/st2/st2.conf if one is not explicitly provided using --config-file command line argument. --- st2actions/st2actions/config.py | 4 +++- st2actions/st2actions/scheduler/config.py | 4 +++- st2actions/st2actions/workflows/config.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/st2actions/st2actions/config.py b/st2actions/st2actions/config.py index 4e03772e37..fbd661a59d 100644 --- a/st2actions/st2actions/config.py +++ b/st2actions/st2actions/config.py @@ -22,12 +22,14 @@ import st2common.config as common_config from st2common.constants.system import VERSION_STRING +from st2common.constants.system import DEFAULT_CONFIG_FILE_PATH CONF = cfg.CONF def parse_args(args=None): - CONF(args=args, version=VERSION_STRING) + CONF(args=args, version=VERSION_STRING, + default_config_files=[DEFAULT_CONFIG_FILE_PATH]) def register_opts(): diff --git a/st2actions/st2actions/scheduler/config.py b/st2actions/st2actions/scheduler/config.py index 27edfd6634..54addb77fb 100644 --- a/st2actions/st2actions/scheduler/config.py +++ b/st2actions/st2actions/scheduler/config.py @@ -19,6 +19,7 @@ from st2common import config as common_config from st2common.constants import system as sys_constants +from st2common.constants.system import DEFAULT_CONFIG_FILE_PATH from st2common import log as logging @@ -26,7 +27,8 @@ def parse_args(args=None): - cfg.CONF(args=args, version=sys_constants.VERSION_STRING) + cfg.CONF(args=args, version=sys_constants.VERSION_STRING, + default_config_files=[DEFAULT_CONFIG_FILE_PATH]) def register_opts(): diff --git a/st2actions/st2actions/workflows/config.py b/st2actions/st2actions/workflows/config.py index ac659ef29c..b5fcfb9e23 100644 --- a/st2actions/st2actions/workflows/config.py +++ b/st2actions/st2actions/workflows/config.py @@ -19,10 +19,12 @@ from st2common import config as common_config from st2common.constants import system as sys_constants +from st2common.constants.system import DEFAULT_CONFIG_FILE_PATH def parse_args(args=None): - cfg.CONF(args=args, version=sys_constants.VERSION_STRING) + cfg.CONF(args=args, version=sys_constants.VERSION_STRING, + default_config_files=[DEFAULT_CONFIG_FILE_PATH]) def register_opts():