Change the name of Metering to new name Telemetry in install guide.

backport: havana
Change-Id: I45b9394f22e5dd630a505acd30685bb33dbb60fd

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. <phrase
                     os="debian">This guide walks through an

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">
-  <title>Add the Metering service</title>
+  <title>Add the Telemetry service</title>
 
-  <para>The OpenStack Metering service provides a framework for
+  <para>The OpenStack Telemetry service provides a framework for
   monitoring and metering the OpenStack cloud. It is also known
   as the Ceilometer project.</para>
        <xi:include href="../common/section_getstart_metering.xml"/>

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">
   <?dbhtml-stop-chunking?>
-  <title>Add the Block Storage Service agent for the Metering
+  <title>Add the Block Storage Service agent for the Telemetry
     service</title>
   <procedure>
     <step>

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">
-  <title>Add the Image Service agent for the Metering service</title>
+  <title>Add the Image Service agent for the Telemetry service</title>
   <procedure>
     <step>
       <para>To retrieve image samples, you must configure the Image

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">
-  <title>Install the Metering Service</title>
+  <title>Install the Telemetry Service</title>
   <procedure>
-    <para>The Metering Service is an API service that provides a
+    <para>The OpenStack Telemetry  Service is an API service that
-      collector and a range of disparate agents. Before you can
+      provides a collector and a range of disparate agents. Before
-      install these agents on nodes such as the compute node, you must
+      you can install these agents on nodes such as the compute
-      use this procedure to install the core components on the
+      node, you must use this procedure to install the core
-      controller node.</para>
+      components on the controller node.</para>
     <step>
-      <para>Install the Metering Service on the controller
+      <para>Install the Telemetry Service on the controller
         node:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install ceilometer-api ceilometer-collector ceilometer-agent-central python-ceilometerclient</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-api openstack-ceilometer-collector openstack-ceilometer-central python-ceilometerclient</userinput></screen>
@@ -26,7 +26,7 @@
         registration.</para>
     </step>
     <step>
-      <para>The Metering Service uses a database to store information.
+      <para>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:</para>
@@ -65,7 +65,7 @@
             } )</userinput></screen>
     </step>
     <step>
-      <para>Configure the Metering Service to use the database:</para>
+      <para>Configure the Telemetry Service to use the database:</para>
       <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf \
   database connection mongodb://ceilometer:<replaceable>CEILOMETER_DBPASS</replaceable>@<replaceable>controller</replaceable>:27017/ceilometer</userinput></screen>
       <para os="ubuntu;debian">Edit the
@@ -82,7 +82,7 @@ connection = mongodb://ceilometer:<replaceable>CEILOMETER_DBPASS</replaceable>@<
     </step>
     <step>
       <para>You must define an secret key that is used as a shared
-        secret among Metering Service nodes. Use
+        secret among Telemetry Service nodes. Use
           <command>openssl</command> to generate a random token and
         store it in the configuration file:</para>
       <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>ADMIN_TOKEN=$(openssl rand -hex 10)</userinput>
@@ -116,7 +116,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
 
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
       <para>Create a <literal>ceilometer</literal> user that the
-        Metering Service uses to authenticate with the Identity
+        Telemetry Service uses to authenticate with the Identity
         Service. Use the <literal>service</literal> tenant and give
         the user the <literal>admin</literal> role:</para>
       <screen><prompt>#</prompt> <userinput>keystone user-create --name=ceilometer --pass=<replaceable>CEILOMETER_PASS</replaceable> --email=<replaceable>ceilometer@example.com</replaceable></userinput>
@@ -124,7 +124,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
     </step>
     <step>
       <para>Add the credentials to the configuration files for the
-        Metering Service:</para>
+        Telemetry Service:</para>
       <screen os="centos;rhel;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf keystone_authtoken auth_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf keystone_authtoken admin_user ceilometer</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf keystone_authtoken admin_tenant_name service</userinput>
@@ -143,12 +143,12 @@ admin_user = ceilometer
 admin_password = <replaceable>CEILOMETER_PASS</replaceable></programlisting>
     </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
-      <para>Register the Metering Service with the Identity Service so
+      <para>Register the Telemetry Service with the Identity Service so
         that other OpenStack services can locate it. Use the
           <command>keystone</command> command to register the service
         and specify the endpoint:</para>
       <screen><prompt>#</prompt> <userinput>keystone service-create --name=ceilometer --type=metering \
-  --description="Ceilometer Metering Service"</userinput></screen>
+  --description="Ceilometer Telemetry Service"</userinput></screen>
     </step>
     <step os="rhel;centos;fedora;opensuse;sles;ubuntu">
       <para>Note the <literal>id</literal> property that is returned

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">
   <?dbhtml-stop-chunking?>
-  <title>Install the Compute agent for the Metering service</title>
+  <title>Install the Compute agent for the Telemetry service</title>
   <procedure>
-    <para>The Metering service consists of an API service, collector
+    <para>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.</para>
     <step>
-      <para>Install the Metering service on the compute node:</para>
+      <para>Install the Telemetry service on the compute node:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install ceilometer-agent-compute</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-ceilometer-compute</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-ceilometer-agent-compute</userinput></screen>
@@ -39,7 +39,7 @@ notification_driver=ceilometer.compute.nova_notifier</programlisting>
     </step>
     <step>
       <para>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:</para>
       <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/ceilometer/ceilometer.conf publisher_rpc metering_secret $ADMIN_TOKEN</userinput></screen>
       <para os="ubuntu;debian">Edit the

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">
-  <title>Add the Object Storage agent for the Metering service</title>
+  <title>Add the Object Storage agent for the Telemetry service</title>
   <procedure>
     <step>
-      <para>To retrieve object store statistics, the Metering service
+      <para>To retrieve object store statistics, the Telemetry service
         needs access to Object Storage with the
           <literal>ResellerAdmin</literal> role. Give this role to
         your <literal>os_username</literal> user for the
@@ -23,7 +23,7 @@
       --role <replaceable>462fa46c13fd4798a95a3bfbe27b5e54</replaceable></userinput></screen>
     </step>
     <step>
-      <para>You must also add the Metering middleware to Object
+      <para>You must also add the Telemetry middleware to Object
         Storage to handle incoming and outgoing traffic. Add
         these lines to the
           <filename>/etc/swift/proxy-server.conf</filename>

doc/install-guide/section_ceilometer-verify.xml

@@ -2,14 +2,14 @@
 <section xml:id="ceilometer-verify" 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">
-  <title>Verify the Metering Service installation</title>
+  <title>Verify the Telemetry Service installation</title>
-  <para>To test the Metering Service installation, download an image from the
+  <para>To test the Telemetry Service installation, download an image from the
-    Image Service, and use the Metering Service to display usage statistics.</para>
+    Image Service, and use the Telemetry Service to display usage statistics.</para>
 
   <procedure>
     <step>
       <para>Use the <literal>ceilometer meter-list</literal> command to test
-        the access to the Metering Service:</para>
+        the access to the Telemetry Service:</para>
       <screen><prompt>$</prompt> <userinput>ceilometer meter-list</userinput></screen>
       <screen><computeroutput>+------------+-------+-------+--------------------------------------+---------+----------------------------------+
 | Name       | Type  | Unit  | Resource ID                          | User ID | Project ID                       |
@@ -24,7 +24,7 @@
     </step>
     <step>
       <para>Call the <literal>ceilometer meter-list</literal> 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:</para>
       <screen><prompt>$</prompt> <userinput>ceilometer meter-list</userinput></screen>
       <screen><computeroutput>+----------------+-------+-------+--------------------------------------+---------+----------------------------------+