Replace persister.conf with monasca-persister.conf
persister.conf is the deprecated path for the configuration file. The new path is /etc/monasca/monasca-persister.conf . This is inline with other OpenStack projects. Also fix the log setup and set the product name to 'monasca-persister' which is inline with other OpenStack and Monasca projects. Change-Id: Ida11c326b3e6771b5ccf994205c55874db05bc5c Story: 2004867 Task: 29112
This commit is contained in:
parent
497f089ee9
commit
a59f436e69
@ -12,6 +12,9 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from oslo_config import cfg
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
|
||||||
from monasca_persister import conf
|
from monasca_persister import conf
|
||||||
@ -23,6 +26,25 @@ LOG = log.getLogger(__name__)
|
|||||||
_CONF_LOADED = False
|
_CONF_LOADED = False
|
||||||
|
|
||||||
|
|
||||||
|
def _get_config_files():
|
||||||
|
"""Get the possible configuration files accepted by oslo.config
|
||||||
|
|
||||||
|
This also includes the deprecated ones
|
||||||
|
"""
|
||||||
|
# default files
|
||||||
|
conf_files = cfg.find_config_files(project='monasca',
|
||||||
|
prog='monasca-persister')
|
||||||
|
# deprecated config files (only used if standard config files are not there)
|
||||||
|
if len(conf_files) == 0:
|
||||||
|
old_conf_files = cfg.find_config_files(project='monasca',
|
||||||
|
prog='persister')
|
||||||
|
if len(old_conf_files) > 0:
|
||||||
|
LOG.warning('Found deprecated old location "{}" '
|
||||||
|
'of main configuration file'.format(old_conf_files))
|
||||||
|
conf_files += old_conf_files
|
||||||
|
return conf_files
|
||||||
|
|
||||||
|
|
||||||
def parse_args():
|
def parse_args():
|
||||||
global _CONF_LOADED
|
global _CONF_LOADED
|
||||||
if _CONF_LOADED:
|
if _CONF_LOADED:
|
||||||
@ -32,13 +54,14 @@ def parse_args():
|
|||||||
log.set_defaults()
|
log.set_defaults()
|
||||||
log.register_options(CONF)
|
log.register_options(CONF)
|
||||||
|
|
||||||
CONF(prog='persister',
|
CONF(prog=sys.argv[1:],
|
||||||
project='monasca',
|
project='monasca',
|
||||||
version=version.version_str,
|
version=version.version_str,
|
||||||
|
default_config_files=_get_config_files(),
|
||||||
description='Persists metrics & alarm history in TSDB')
|
description='Persists metrics & alarm history in TSDB')
|
||||||
|
|
||||||
log.setup(CONF,
|
log.setup(CONF,
|
||||||
product_name='persister',
|
product_name='monasca-persister',
|
||||||
version=version.version_str)
|
version=version.version_str)
|
||||||
|
|
||||||
conf.register_opts()
|
conf.register_opts()
|
||||||
|
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
Configuration file path /etc/monasca/persister.conf is deprecated.
|
||||||
|
Use the standard path /etc/monasca/monasca-persister.conf or the
|
||||||
|
configuration dir (supported via oslo.config)
|
||||||
|
/etc/monasca/monasca-persister.conf.d/any_config_name.conf
|
||||||
|
|
Loading…
Reference in New Issue
Block a user