From 42292e1ecddaa9ba0220ae3bd478984d8f9d98e4 Mon Sep 17 00:00:00 2001
From: Miguel Alex Cantu <miguel.cantu@rackspace.com>
Date: Mon, 20 Feb 2017 21:20:13 +0000
Subject: [PATCH] Deprecate ceilometer-collector

Per https://review.openstack.org/#/c/413920/, the ceilometer-collector
service is now deprecated.
This commit removes the inventory group mappings to the
ceilometer-collector service/container. It also removes
the service from the bootstrap and testing inventory.

Relates-To: I396b154d106c0afba44d57792ae6dad39b33a6f5
Closes-Bug: 1666238
Change-Id: Ied14c2a0eda928197c187ad28781568f2d58f51c
---
 doc/source/developer-docs/quickstart-aio.rst           |  1 -
 playbooks/inventory/env.d/ceilometer.yml               | 10 ----------
 .../bootstrap-host/templates/user_variables.aio.yml.j2 |  1 -
 tests/test_inventory.py                                |  2 --
 4 files changed, 14 deletions(-)

diff --git a/doc/source/developer-docs/quickstart-aio.rst b/doc/source/developer-docs/quickstart-aio.rst
index c0b3842645..dcd2683b1e 100644
--- a/doc/source/developer-docs/quickstart-aio.rst
+++ b/doc/source/developer-docs/quickstart-aio.rst
@@ -306,7 +306,6 @@ built for informational purposes only and should **ONLY** be used as such.
       |        [ Nova console ]<---------|  |  |                        |
       |        [ Nova Cert ]<------------|->|  |                        |
       |        [ Ceilometer api ]<-------|->|  |                        |
-      |        [ Ceilometer collector ]<-|->|  |                        |
       |        [ Cinder api ]<-----------|->|  |                        |
       |        [ Glance api ]<-----------|->|  |                        |
       |        [ Heat apis ]<------------|->|  | [ Loop back devices ]*-*
diff --git a/playbooks/inventory/env.d/ceilometer.yml b/playbooks/inventory/env.d/ceilometer.yml
index 67e472487b..5e046a3479 100644
--- a/playbooks/inventory/env.d/ceilometer.yml
+++ b/playbooks/inventory/env.d/ceilometer.yml
@@ -9,9 +9,6 @@ component_skel:
   ceilometer_agent_notification:
     belongs_to:
     - ceilometer_all
-  ceilometer_collector:
-    belongs_to:
-    - ceilometer_all
   ceilometer_api:
     belongs_to:
     - ceilometer_all
@@ -26,13 +23,6 @@ container_skel:
       - ceilometer_api
     properties:
       service_name: ceilometer
-  ceilometer_collector_container:
-    belongs_to:
-      - metering-infra_containers
-    contains:
-      - ceilometer_collector
-    properties:
-      service_name: ceilometer
   metering-compute_container:
     belongs_to:
     - metering-compute_containers
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index 7fd053d4e3..5fd166150c 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -31,7 +31,6 @@ neutron_metadata_checksum_fix: True
 
 ## Set workers for all services to optimise memory usage
 ceilometer_api_workers: 2
-ceilometer_collector_workers: 2
 ceilometer_notification_workers: 2
 cinder_osapi_volume_workers: 2
 glance_api_workers: 2
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index 9a9ae07d7f..3a89bdde0f 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -150,8 +150,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'ceilometer_all',
         'ceilometer_api',
         'ceilometer_api_container',
-        'ceilometer_collector',
-        'ceilometer_collector_container',
         'ceph_all',
         'ceph-mon_all',
         'ceph-mon_containers',