openstack/openstack-ansible
Code Issues Proposed changes

Deprecate ceilometer-collector

Browse Source 
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
This commit is contained in:
Miguel Alex Cantu 2017-02-20 21:20:13 +00:00 committed by alextricity25
parent b1a6ed307f
commit 42292e1ecd
4 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/developer-docs/quickstart-aio.rst
View File

@ -306,7 +306,6 @@ built for informational purposes only and should **ONLY** be used as such.
| [ Nova console ]<---------| | | | | [ Nova console ]<---------| | | |
| [ Nova Cert ]<------------|->| | | | [ Nova Cert ]<------------|->| | |
| [ Ceilometer api ]<-------|->| | | | [ Ceilometer api ]<-------|->| | |
| [ Ceilometer collector ]<-|->| | |
| [ Cinder api ]<-----------|->| | | | [ Cinder api ]<-----------|->| | |
| [ Glance api ]<-----------|->| | | | [ Glance api ]<-----------|->| | |
| [ Heat apis ]<------------|->| | [ Loop back devices ]*-* | [ Heat apis ]<------------|->| | [ Loop back devices ]*-*

10
playbooks/inventory/env.d/ceilometer.yml
View File

@ -9,9 +9,6 @@ component_skel:
ceilometer_agent_notification: ceilometer_agent_notification:
belongs_to: belongs_to:
- ceilometer_all - ceilometer_all
ceilometer_collector:
belongs_to:
- ceilometer_all
ceilometer_api: ceilometer_api:
belongs_to: belongs_to:
- ceilometer_all - ceilometer_all
@ -26,13 +23,6 @@ container_skel:
- ceilometer_api - ceilometer_api
properties: properties:
service_name: ceilometer service_name: ceilometer
ceilometer_collector_container:
belongs_to:
- metering-infra_containers
contains:
- ceilometer_collector
properties:
service_name: ceilometer
metering-compute_container: metering-compute_container:
belongs_to: belongs_to:
- metering-compute_containers - metering-compute_containers

1
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -31,7 +31,6 @@ neutron_metadata_checksum_fix: True
## Set workers for all services to optimise memory usage ## Set workers for all services to optimise memory usage
ceilometer_api_workers: 2 ceilometer_api_workers: 2
ceilometer_collector_workers: 2
ceilometer_notification_workers: 2 ceilometer_notification_workers: 2
cinder_osapi_volume_workers: 2 cinder_osapi_volume_workers: 2
glance_api_workers: 2 glance_api_workers: 2

2
tests/test_inventory.py
View File

@ -150,8 +150,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
'ceilometer_all', 'ceilometer_all',
'ceilometer_api', 'ceilometer_api',
'ceilometer_api_container', 'ceilometer_api_container',
'ceilometer_collector',
'ceilometer_collector_container',
'ceph_all', 'ceph_all',
'ceph-mon_all', 'ceph-mon_all',
'ceph-mon_containers', 'ceph-mon_containers',