4db5a58d0d
Currently default config files are being for initialization of CONF from oslo_config. However default config dirs are not being passed as a result watcher components (eg: decision-engine) are unable to load files from default directories (eg: /etc/watcher/watcher.conf.d) supported by oslo_config. This is a short-coming on watcher's side. Also this forces user to have multiple config for each component. Without this default set, oslo_config will search for conf with string 'python-watcher' in it, eg: /etc/python-watcher/.... Since there is a because project=python-watcher a couple of lines below This patch adds the option after evaluating using project as 'watcher' which is similar to evaluation of default_config_files and also allows it to be passed in as a function parameter. Change-Id: I013f9d03978f8716847f8d1ee6888629faf5779b (cherry picked from commitdce23d7eb4) (cherry picked from commitec5780902f)
36 lines
1.4 KiB
Python
36 lines
1.4 KiB
Python
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
# Copyright 2012 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo_config import cfg
|
|
|
|
from watcher.common import rpc
|
|
from watcher import version
|
|
|
|
|
|
def parse_args(argv, default_config_files=None, default_config_dirs=None):
|
|
default_config_files = (default_config_files or
|
|
cfg.find_config_files(project='watcher'))
|
|
default_config_dirs = (default_config_dirs or
|
|
cfg.find_config_dirs(project='watcher'))
|
|
rpc.set_defaults(control_exchange='watcher')
|
|
cfg.CONF(argv[1:],
|
|
project='python-watcher',
|
|
version=version.version_info.release_string(),
|
|
default_config_dirs=default_config_dirs,
|
|
default_config_files=default_config_files)
|
|
rpc.init(cfg.CONF)
|