From bafcd2eeae8be6ff387da948f82a9b4a54a13153 Mon Sep 17 00:00:00 2001 From: Cedric Soulas Date: Thu, 23 May 2013 12:58:19 +0200 Subject: [PATCH] doc: fix hyphens instead of underscores for 'os*' conf options The ceilometer documentation, on the configuration page, list some options with hyphens (e.g. 'os-tenant-id') which are unknown options: underscores are required instead (e.g.: 'os_tenant_id'). Fixes: bug #1177002 Change-Id: Iea9c53f628df0b3bed06206e9b2241ed949131fa --- doc/source/configuration.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index ef996af0c..73104f568 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -40,11 +40,11 @@ metering_topic metering the topic counter_source openstack The source name of emited counters control_exchange ceilometer AMQP exchange to connect to if using RabbitMQ or Qpid periodic_interval 600 seconds between running periodic tasks -os-username ceilometer Username to use for openstack service access -os-password admin Password to use for openstack service access -os-tenant-id Tenant ID to use for openstack service access -os-tenant-name admin Tenant name to use for openstack service access -os-auth-url http://localhost:5000/v2.0 Auth URL to use for openstack service access +os_username ceilometer Username to use for openstack service access +os_password admin Password to use for openstack service access +os_tenant_id Tenant ID to use for openstack service access +os_tenant_name admin Tenant name to use for openstack service access +os_auth_url http://localhost:5000/v2.0 Auth URL to use for openstack service access database_connection mongodb://localhost:27017/ceilometer Database connection string metering_api_port 8777 The port for the ceilometer API server disabled_central_pollsters List of central pollsters to skip loading