Skip to content

Fix default config file location for some services #4596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 14, 2019
Merged

Fix default config file location for some services #4596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c20abc
Fix some services (st2actionrunner, st2scheduler, st2workflowengine) to
Kami Mar 13, 2019
4d031aa
Merge branch 'master' into fix_default_config_for_some_services
Kami Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion st2actions/st2actions/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 3 additions & 1 deletion st2actions/st2actions/scheduler/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@

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


LOG = logging.getLogger(__name__)


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():
Expand Down
4 changes: 3 additions & 1 deletion st2actions/st2actions/workflows/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down