From a59f436e69182186cf61146086188e53eb0430c9 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Fri, 25 Jan 2019 16:59:03 +0100
Subject: [PATCH] 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
---
 monasca_persister/config.py                   | 27 +++++++++++++++++--
 ...ard-config-file-path-3e0c482e33eaab89.yaml |  8 ++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/use-standard-config-file-path-3e0c482e33eaab89.yaml

diff --git a/monasca_persister/config.py b/monasca_persister/config.py
index 788e2e74..00e85367 100644
--- a/monasca_persister/config.py
+++ b/monasca_persister/config.py
@@ -12,6 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import sys
+
+from oslo_config import cfg
 from oslo_log import log
 
 from monasca_persister import conf
@@ -23,6 +26,25 @@ LOG = log.getLogger(__name__)
 _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():
     global _CONF_LOADED
     if _CONF_LOADED:
@@ -32,13 +54,14 @@ def parse_args():
     log.set_defaults()
     log.register_options(CONF)
 
-    CONF(prog='persister',
+    CONF(prog=sys.argv[1:],
          project='monasca',
          version=version.version_str,
+         default_config_files=_get_config_files(),
          description='Persists metrics & alarm history in TSDB')
 
     log.setup(CONF,
-              product_name='persister',
+              product_name='monasca-persister',
               version=version.version_str)
 
     conf.register_opts()
diff --git a/releasenotes/notes/use-standard-config-file-path-3e0c482e33eaab89.yaml b/releasenotes/notes/use-standard-config-file-path-3e0c482e33eaab89.yaml
new file mode 100644
index 00000000..7f630426
--- /dev/null
+++ b/releasenotes/notes/use-standard-config-file-path-3e0c482e33eaab89.yaml
@@ -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
+