From 4a31748b306f546a01608268f1c339d27c30a14d Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 7 Nov 2012 16:38:32 -0500 Subject: [PATCH] Fix documentation build Re-establish the static "app" instance for the autodoc code and fix a formatting problem with some of the RST. Change-Id: I16f7db1ed66081305097b5ecf931b461347f6299 Signed-off-by: Doug Hellmann --- ceilometer/api/app.py | 3 +++ doc/source/install.rst | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py index 6b446d0f..983e92ce 100644 --- a/ceilometer/api/app.py +++ b/ceilometer/api/app.py @@ -57,3 +57,6 @@ def make_app(enable_acl=True, attach_storage=True): if enable_acl: return acl.install(app, cfg.CONF) return app + +# For documentation +app = make_app(enable_acl=False, attach_storage=False) diff --git a/doc/source/install.rst b/doc/source/install.rst index de01aa8f..d7644714 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -150,11 +150,11 @@ Installing the Compute Agent The ``nova`` compute service needs the following configuration to be set in ``nova.conf``:: - # nova-compute configuration for ceilometer - instance_usage_audit=True - instance_usage_audit_period=hour - notification_driver=nova.openstack.common.notifier.rabbit_notifier - notification_driver=ceilometer.compute.nova_notifier + # nova-compute configuration for ceilometer + instance_usage_audit=True + instance_usage_audit_period=hour + notification_driver=nova.openstack.common.notifier.rabbit_notifier + notification_driver=ceilometer.compute.nova_notifier 2. Clone the ceilometer git repository to the server::