From e4d170a57c76ee83c858372a79ae7a43b32b6968 Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@redhat.com>
Date: Wed, 14 Nov 2012 15:50:19 +1100
Subject: [PATCH] Change references of /etc/ceilometer-{agent,collector}.conf
 to /etc/ceilometer/ceilometer.conf

Complete the change to the global config file.

So by adding the project name to the call to cfg.CONF() we go from
the following search dirs:
cfg_dirs: ['/home/asalkeld', '/etc']
to:
cfg_dirs: ['/home/asalkeld/.ceilometer', '/home/asalkeld', '/etc/ceilometer', '/etc']

So you can end up with multiple configs loading like this:

DEBUG ceilometer.openstack.common.service [-] config file: ['/etc/ceilometer/ceilometer.conf', '/etc/ceilometer-collector.conf']

Change-Id: I8e75facb5f1dc7e3e66493824a2da15a5b9ab311
---
 ceilometer/service.py  |  2 +-
 doc/source/install.rst | 12 ++++++------
 tools/show_data.py     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ceilometer/service.py b/ceilometer/service.py
index d65b4724..0fb2b01f 100644
--- a/ceilometer/service.py
+++ b/ceilometer/service.py
@@ -92,7 +92,7 @@ def _init_nova_config(argv):
 
 
 def prepare_service(argv=[]):
-    cfg.CONF(argv[1:])
+    cfg.CONF(argv[1:], project='ceilometer')
     # FIXME(dhellmann): We must set up the nova.flags module in order
     # to have the RPC and DB access work correctly because we are
     # still using the Service object out of nova directly. We need to
diff --git a/doc/source/install.rst b/doc/source/install.rst
index 164a7b75..8189d08f 100644
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -103,11 +103,11 @@ Installing the Collector
 
    Ceilometer needs to know about some of the nova configuration
    options, so the simplest way to start is copying
-   ``/etc/nova/nova.conf`` to ``/etc/ceilometer-collector.conf``. Some
+   ``/etc/nova/nova.conf`` to ``/etc/ceilometer/ceilometer.conf``. Some
    of the logging settings used in nova break ceilometer, so they need
    to be removed. For example, as a user with ``root`` permissions::
 
-     $ grep -v format_string /etc/nova/nova.conf > /etc/ceilometer-collector.conf
+     $ grep -v format_string /etc/nova/nova.conf > /etc/ceilometer/ceilometer.conf
 
    Refer to :doc:`configuration` for details about any other options
    you might want to modify before starting the service.
@@ -171,11 +171,11 @@ Installing the Compute Agent
 
    Ceilometer needs to know about some of the nova configuration
    options, so the simplest way to start is copying
-   ``/etc/nova/nova.conf`` to ``/etc/ceilometer-agent.conf``. Some
+   ``/etc/nova/nova.conf`` to ``/etc/ceilometer/ceilometer.conf``. Some
    of the logging settings used in nova break ceilometer, so they need
    to be removed. For example, as a user with ``root`` permissions::
 
-     $ grep -v format_string /etc/nova/nova.conf > /etc/ceilometer-agent.conf
+     $ grep -v format_string /etc/nova/nova.conf > /etc/ceilometer/ceilometer.conf
 
    Refer to :doc:`configuration` for details about any other options
    you might want to modify before starting the service.
@@ -223,11 +223,11 @@ Installing the API Server
 
    Ceilometer needs to know about some of the nova configuration
    options, so the simplest way to start is copying
-   ``/etc/nova/nova.conf`` to ``/etc/ceilometer-agent.conf``. Some
+   ``/etc/nova/nova.conf`` to ``/etc/ceilometer/ceilometer.conf``. Some
    of the logging settings used in nova break ceilometer, so they need
    to be removed. For example, as a user with ``root`` permissions::
 
-     $ grep -v format_string /etc/nova/nova.conf > /etc/ceilometer-agent.conf
+     $ grep -v format_string /etc/nova/nova.conf > /etc/ceilometer/ceilometer.conf
 
    Refer to :doc:`configuration` for details about any other options
    you might want to modify before starting the service.
diff --git a/tools/show_data.py b/tools/show_data.py
index 3db7eb84..772b42bc 100755
--- a/tools/show_data.py
+++ b/tools/show_data.py
@@ -120,7 +120,7 @@ def main(argv):
         sys.argv[1:],
         # NOTE(dhellmann): Read the configuration file(s) for the
         #ceilometer collector by default.
-        default_config_files=['/etc/ceilometer-collector.conf'],
+        default_config_files=['/etc/ceilometer/ceilometer.conf'],
         )
     storage.register_opts(cfg.CONF)
     db = storage.get_connection(cfg.CONF)