openstack/ceilometer
Code Issues Proposed changes

Change references of /etc/ceilometer-{agent,collector}.conf to /etc/ceilometer/ceilometer.conf

Browse Source 
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
This commit is contained in:
Angus Salkeld 2012-11-14 15:50:19 +11:00
parent 6d72e832fd
commit e4d170a57c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/service.py
View File

@ -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

12
doc/source/install.rst
View File

@ -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.

2
tools/show_data.py
View File

@ -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)