From 7f9264b1948aa60796d675db998c7abc301c4215 Mon Sep 17 00:00:00 2001 From: "Nicolas Barcet (nijaba)" Date: Tue, 9 Oct 2012 02:28:12 +0200 Subject: [PATCH] Assorted doc fixes Remove FIXME:... and move to LP as 1064126 Reorganize Install section TOC Fix little gnats in configuration.rst Change-Id: I005574054ccdcfc293e7b2cbb29fbffae8e7ef51 --- doc/source/configuration.rst | 4 ++-- doc/source/contributing/plugins.rst | 2 -- doc/source/install.rst | 8 +++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 1a2961126..cad2968b0 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -93,7 +93,7 @@ state_path currentdir Top-level dir sqlite_db nova.sqlite file name for sqlite sql_connection sqlite:///$state_path/$sqlite_db connection string for sql database matchmaker_ringfile /etc/nova/matchmaker_ring.json Matchmaker ring file (JSON) -rpc_zmq_bind_address * ZeroMQ bind address +rpc_zmq_bind_address '*' ZeroMQ bind address rpc_zmq_matchmaker ceilometer.openstack.common.rpc. MatchMaker drivers matchmaker.MatchMakerLocalhost rpc_zmq_port 9501 ZeroMQ receiver listening port @@ -110,7 +110,7 @@ rabbit_retry_interval 1 how frequentl rabbit_retry_backoff 2 how long to backoff for between retries when connecting rabbit_max_retries 0 maximum retries with trying to connect to RabbitMQ (the default of 0 implies an infinite retry count) -rabbit_durable_queues +rabbit_durable_queues False use durable queues in RabbitMQ rabbit_use_ssl False connect over SSL for RabbitMQ rabbit_durable_queues False use durable queues in RabbitMQ rabbit_ha_queues False use H/A queues in RabbitMQ (x-ha-policy: all). diff --git a/doc/source/contributing/plugins.rst b/doc/source/contributing/plugins.rst index b86730df3..aea4b8af3 100644 --- a/doc/source/contributing/plugins.rst +++ b/doc/source/contributing/plugins.rst @@ -117,5 +117,3 @@ plugins in the directory ``tests/compute`` and for the agent itself in ``test/ag Unit tests are run in a continuous integration process for each commit made to the project, thus ensuring as best as possible that a given patch has no side effect to the rest of the project. - -.. todo:: FIXME: could not find a unit test for CPUPollster diff --git a/doc/source/install.rst b/doc/source/install.rst index 7433b0df2..df6d79db8 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -16,9 +16,12 @@ .. _install: ================================================ - Installing and Running the Development Version +Install ================================================ +Installing and Running the Development Version +++++++++++++++++++++++++++++++++++++++++++++++= + Ceilometer has four daemons. The :term:`compute agent` runs on the Nova compute node(s) while the :term:`central agent` and :term:`collector` run on the cloud's management node(s). In a @@ -58,9 +61,8 @@ ceilometer:: # Enable the ceilometer services enable_service ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api -=================== Installing Manually -=================== ++++++++++++++++++++ Installing the Collector ========================