From 42cd0fffc2e3c813a7f1210b480beb4cd028e6fc Mon Sep 17 00:00:00 2001
From: Alberto Murillo <alberto.murillo.silva@intel.com>
Date: Mon, 8 Feb 2016 12:46:51 -0600
Subject: [PATCH] Rename bundle openstack-telemetry-controller to
 openstack-telemetry

- This bundle is installed on hosts other than controller so a more
  generic name is desired
---
 source/bundles_in_clr.rst                       | 4 ++--
 source/bundles_overview.rst                     | 4 ++--
 source/openstack_bundle_and_service_summary.rst | 2 +-
 source/openstack_telemetry.rst                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/bundles_in_clr.rst b/source/bundles_in_clr.rst
index 2daea021..5339555c 100644
--- a/source/bundles_in_clr.rst
+++ b/source/bundles_in_clr.rst
@@ -511,7 +511,7 @@ Current list of bundles available for Clear Linux* OS for Intel® Architecture:
                 </ul>
                 <p></p>
                 <ul>
-                    <li>Includes (openstack-telemetry-controller) bundle.</li>
+                    <li>Includes (openstack-telemetry) bundle.</li>
                 </ul>
                 <p></p>
             </td><!-- <td align=left><p></p></td> -->
@@ -671,7 +671,7 @@ Current list of bundles available for Clear Linux* OS for Intel® Architecture:
             <!-- <td align=left><p></p></td> -->
         </tr>
         <tr>
-            <td align="left">openstack-telemetry-controller</td>
+            <td align="left">openstack-telemetry</td>
             <td align="center">WIP</td>
             <td align="left">
                 <p>Provides an OpenStack Telemetry server</p>
diff --git a/source/bundles_overview.rst b/source/bundles_overview.rst
index 36db35da..7c725d55 100644
--- a/source/bundles_overview.rst
+++ b/source/bundles_overview.rst
@@ -431,7 +431,7 @@ Current list of available bundles:
                                                                             <li>Includes (openstack-orchestration) bundle.</p>
                                                                                 <li>Includes (openstack-python-clients) bundle.</p>
                                                                                     <li>Includes (openstack-vpnaas) bundle.</p>
-                                                                                        <li>Includes (openstack-telemetry-controller) bundle.</p>
+                                                                                        <li>Includes (openstack-telemetry) bundle.</p>
             </td>
             <!-- <td><p></p></td> -->
             <!-- <td><p></p></td> -->
@@ -589,7 +589,7 @@ Current list of available bundles:
             <!-- <td><p></p></td> -->
         </tr>
         <tr>
-            <td class="bundlename"> openstack-telemetry-controller</td>
+            <td class="bundlename"> openstack-telemetry</td>
             <td class="bundlestatus"> WIP</td>
             <td class="bundledesc">
                 <p> Provides an OpenStack Telemetry server</p>
diff --git a/source/openstack_bundle_and_service_summary.rst b/source/openstack_bundle_and_service_summary.rst
index b300bef0..6a87fe72 100644
--- a/source/openstack_bundle_and_service_summary.rst
+++ b/source/openstack_bundle_and_service_summary.rst
@@ -31,7 +31,7 @@ services:
    replication and scale-out architecture."
    "openstack-block-storage/openstack-block-storage-controller", "Cinder", "Provides
    persistent block storage to running instances."
-   "openstack-telemetry-controller", "Ceilometer", "Monitors and meters the
+   "openstack-telemetry", "Ceilometer", "Monitors and meters the
    OpenStack cloud for billing, benchmarking, scalability, and statistical
    purposes."
    "openstack-orchestration", "Heat", "Orchestrates multiple composite cloud
diff --git a/source/openstack_telemetry.rst b/source/openstack_telemetry.rst
index be884926..4ab51917 100644
--- a/source/openstack_telemetry.rst
+++ b/source/openstack_telemetry.rst
@@ -160,7 +160,7 @@ Install and configure components
 
 #. Install the OpenStack Telemetry Controller bundle::
 
-   	# swupd bundle-add openstack-telemetry-controller
+   	# swupd bundle-add openstack-telemetry
 
 #. Custom configurations will be located at ``/etc/ceilometer``.