From 56ae73a8f256b1cfb9e80315b5a5565a80e68607 Mon Sep 17 00:00:00 2001 From: Chandan kumar Date: Thu, 28 Nov 2013 16:35:33 +0530 Subject: [PATCH] Change the name of Metering to new name Telemetry in install guide. backport: havana Change-Id: I45b9394f22e5dd630a505acd30685bb33dbb60fd --- .../bk_openstackinstallguide.xml | 2 +- doc/install-guide/ch_ceilometer.xml | 4 +-- .../section_ceilometer-cinder.xml | 2 +- .../section_ceilometer-glance.xml | 2 +- .../section_ceilometer-install.xml | 28 +++++++++---------- doc/install-guide/section_ceilometer-nova.xml | 8 +++--- .../section_ceilometer-swift.xml | 6 ++-- .../section_ceilometer-verify.xml | 10 +++---- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/install-guide/bk_openstackinstallguide.xml b/doc/install-guide/bk_openstackinstallguide.xml index 2bcfd5d504..814afdda06 100644 --- a/doc/install-guide/bk_openstackinstallguide.xml +++ b/doc/install-guide/bk_openstackinstallguide.xml @@ -52,7 +52,7 @@ together depending on your cloud needs. These projects include Compute, Identity Service, Networking, Image Service, Block Storage Service, Object Storage, - Metering, and Orchestration. You can install any of + Telemetry, and Orchestration. You can install any of these projects separately and configure them standalone or as connected entities. This guide walks through an diff --git a/doc/install-guide/ch_ceilometer.xml b/doc/install-guide/ch_ceilometer.xml index d340794568..4330508275 100644 --- a/doc/install-guide/ch_ceilometer.xml +++ b/doc/install-guide/ch_ceilometer.xml @@ -3,9 +3,9 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ch_ceilometer"> - Add the Metering service + Add the Telemetry service - The OpenStack Metering service provides a framework for + The OpenStack Telemetry service provides a framework for monitoring and metering the OpenStack cloud. It is also known as the Ceilometer project. diff --git a/doc/install-guide/section_ceilometer-cinder.xml b/doc/install-guide/section_ceilometer-cinder.xml index 382851af7f..8238b0d303 100644 --- a/doc/install-guide/section_ceilometer-cinder.xml +++ b/doc/install-guide/section_ceilometer-cinder.xml @@ -4,7 +4,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - Add the Block Storage Service agent for the Metering + <title>Add the Block Storage Service agent for the Telemetry service diff --git a/doc/install-guide/section_ceilometer-glance.xml b/doc/install-guide/section_ceilometer-glance.xml index 031902f144..f8e2b8de73 100644 --- a/doc/install-guide/section_ceilometer-glance.xml +++ b/doc/install-guide/section_ceilometer-glance.xml @@ -3,7 +3,7 @@ xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - Add the Image Service agent for the Metering service + Add the Image Service agent for the Telemetry service To retrieve image samples, you must configure the Image diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml index 8b92b9cb1e..cd173f29b9 100644 --- a/doc/install-guide/section_ceilometer-install.xml +++ b/doc/install-guide/section_ceilometer-install.xml @@ -3,15 +3,15 @@ xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - Install the Metering Service + Install the Telemetry Service - The Metering Service is an API service that provides a - collector and a range of disparate agents. Before you can - install these agents on nodes such as the compute node, you must - use this procedure to install the core components on the - controller node. + The OpenStack Telemetry Service is an API service that + provides a collector and a range of disparate agents. Before + you can install these agents on nodes such as the compute + node, you must use this procedure to install the core + components on the controller node. - Install the Metering Service on the controller + Install the Telemetry Service on the controller node: # apt-get install ceilometer-api ceilometer-collector ceilometer-agent-central python-ceilometerclient # yum install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-central python-ceilometerclient @@ -26,7 +26,7 @@ registration. - The Metering Service uses a database to store information. + The Telemetry Service uses a database to store information. Specify the location of the database in the configuration file. The examples use a MongoDB database on the controller node: @@ -65,7 +65,7 @@ } ) - Configure the Metering Service to use the database: + Configure the Telemetry Service to use the database: # openstack-config --set /etc/ceilometer/ceilometer.conf \ database connection mongodb://ceilometer:CEILOMETER_DBPASS@controller:27017/ceilometer Edit the @@ -82,7 +82,7 @@ connection = mongodb://ceilometer:CEILOMETER_DBPASS@< You must define an secret key that is used as a shared - secret among Metering Service nodes. Use + secret among Telemetry Service nodes. Use openssl to generate a random token and store it in the configuration file: # ADMIN_TOKEN=$(openssl rand -hex 10) @@ -116,7 +116,7 @@ rabbit_password = RABBIT_PASS Create a ceilometer user that the - Metering Service uses to authenticate with the Identity + Telemetry Service uses to authenticate with the Identity Service. Use the service tenant and give the user the admin role: # keystone user-create --name=ceilometer --pass=CEILOMETER_PASS --email=ceilometer@example.com @@ -124,7 +124,7 @@ rabbit_password = RABBIT_PASS Add the credentials to the configuration files for the - Metering Service: + Telemetry Service: # openstack-config --set /etc/ceilometer/ceilometer.conf keystone_authtoken auth_host controller # openstack-config --set /etc/ceilometer/ceilometer.conf keystone_authtoken admin_user ceilometer # openstack-config --set /etc/ceilometer/ceilometer.conf keystone_authtoken admin_tenant_name service @@ -143,12 +143,12 @@ admin_user = ceilometer admin_password = CEILOMETER_PASS - Register the Metering Service with the Identity Service so + Register the Telemetry Service with the Identity Service so that other OpenStack services can locate it. Use the keystone command to register the service and specify the endpoint: # keystone service-create --name=ceilometer --type=metering \ - --description="Ceilometer Metering Service" + --description="Ceilometer Telemetry Service" Note the id property that is returned diff --git a/doc/install-guide/section_ceilometer-nova.xml b/doc/install-guide/section_ceilometer-nova.xml index 665fd56da8..4a673a2a24 100644 --- a/doc/install-guide/section_ceilometer-nova.xml +++ b/doc/install-guide/section_ceilometer-nova.xml @@ -4,13 +4,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - Install the Compute agent for the Metering service + Install the Compute agent for the Telemetry service - The Metering service consists of an API service, collector + The Telemetry service consists of an API service, collector and a range of disparate agents. This procedure details the installation of the agent that runs on compute nodes. - Install the Metering service on the compute node: + Install the Telemetry service on the compute node: # apt-get install ceilometer-agent-compute # yum install openstack-ceilometer-compute # zypper install openstack-ceilometer-agent-compute @@ -39,7 +39,7 @@ notification_driver=ceilometer.compute.nova_notifier You must set the secret key that you defined previously. - The Metering service nodes share this key as a shared + The Telemetry service nodes share this key as a shared secret: # openstack-config --set /etc/ceilometer/ceilometer.conf publisher_rpc metering_secret $ADMIN_TOKEN Edit the diff --git a/doc/install-guide/section_ceilometer-swift.xml b/doc/install-guide/section_ceilometer-swift.xml index 4ee99c1ccb..0d378d4834 100644 --- a/doc/install-guide/section_ceilometer-swift.xml +++ b/doc/install-guide/section_ceilometer-swift.xml @@ -3,10 +3,10 @@ xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - Add the Object Storage agent for the Metering service + Add the Object Storage agent for the Telemetry service - To retrieve object store statistics, the Metering service + To retrieve object store statistics, the Telemetry service needs access to Object Storage with the ResellerAdmin role. Give this role to your os_username user for the @@ -23,7 +23,7 @@ --role 462fa46c13fd4798a95a3bfbe27b5e54 - You must also add the Metering middleware to Object + You must also add the Telemetry middleware to Object Storage to handle incoming and outgoing traffic. Add these lines to the /etc/swift/proxy-server.conf diff --git a/doc/install-guide/section_ceilometer-verify.xml b/doc/install-guide/section_ceilometer-verify.xml index e8125f0142..f41d74d519 100644 --- a/doc/install-guide/section_ceilometer-verify.xml +++ b/doc/install-guide/section_ceilometer-verify.xml @@ -2,14 +2,14 @@
- Verify the Metering Service installation - To test the Metering Service installation, download an image from the - Image Service, and use the Metering Service to display usage statistics. + Verify the Telemetry Service installation + To test the Telemetry Service installation, download an image from the + Image Service, and use the Telemetry Service to display usage statistics. Use the ceilometer meter-list command to test - the access to the Metering Service: + the access to the Telemetry Service: $ ceilometer meter-list +------------+-------+-------+--------------------------------------+---------+----------------------------------+ | Name | Type | Unit | Resource ID | User ID | Project ID | @@ -24,7 +24,7 @@ Call the ceilometer meter-list command again to - validate that the download has been detected and stored by the Metering + validate that the download has been detected and stored by the Telemetry Service: $ ceilometer meter-list +----------------+-------+-------+--------------------------------------+---------+----------------------------------+