Merge "Deprecate ceilometer-collector"

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 ]*-*

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

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

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',