From f9061c0504df5e129ce94b2fc4b4482288564e93 Mon Sep 17 00:00:00 2001 From: Miguel Alex Cantu Date: Fri, 3 Mar 2017 15:44:41 +0000 Subject: [PATCH] Remove Ceilometer API Service The Ceilometer API is now deprecated in favor of using Gnocchi, Aodh, and Panko to pull telemetry information Change-Id: I239c23487d28f9892591e56677976ff6a0caea9d Partial-Bug: 1666640 --- deploy-guide/source/app-advanced-config-override.rst | 1 - doc/source/developer-docs/quickstart-aio.rst | 1 - .../openstack_user_config.yml.prod.example | 4 ++-- playbooks/inventory/env.d/ceilometer.yml | 6 +----- playbooks/os-ceilometer-install.yml | 2 +- playbooks/vars/configs/haproxy_config.yml | 8 -------- .../bootstrap-host/templates/user_variables.aio.yml.j2 | 1 - tests/test_inventory.py | 5 ++--- 8 files changed, 6 insertions(+), 22 deletions(-) diff --git a/deploy-guide/source/app-advanced-config-override.rst b/deploy-guide/source/app-advanced-config-override.rst index f7610f7520..e1658f0cd6 100644 --- a/deploy-guide/source/app-advanced-config-override.rst +++ b/deploy-guide/source/app-advanced-config-override.rst @@ -194,7 +194,6 @@ Galera: Telemetry service (ceilometer): * ceilometer_policy_overrides * ceilometer_ceilometer_conf_overrides - * ceilometer_api_paste_ini_overrides * ceilometer_event_definitions_yaml_overrides * ceilometer_event_pipeline_yaml_overrides * ceilometer_pipeline_yaml_overrides diff --git a/doc/source/developer-docs/quickstart-aio.rst b/doc/source/developer-docs/quickstart-aio.rst index 381cb192c7..d48f5b0cf8 100644 --- a/doc/source/developer-docs/quickstart-aio.rst +++ b/doc/source/developer-docs/quickstart-aio.rst @@ -326,7 +326,6 @@ built for informational purposes only and should **ONLY** be used as such. | [ Nova api os ]<----------|->| | | | [ Nova console ]<---------| | | | | [ Nova Cert ]<------------|->| | | - | [ Ceilometer api ]<-------|->| | | | [ Cinder api ]<-----------|->| | | | [ Glance api ]<-----------|->| | | | [ Heat apis ]<------------|->| | [ Loop back devices ]*-* diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example index 7917c20eeb..14b9df81a0 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.prod.example +++ b/etc/openstack_deploy/openstack_user_config.yml.prod.example @@ -206,7 +206,7 @@ network_hosts: infra3: ip: 172.29.236.13 -# ceilometer (telemetry API) +# ceilometer (telemetry data collection) metering-infra_hosts: infra1: ip: 172.29.236.11 @@ -240,7 +240,7 @@ compute_hosts: compute2: ip: 172.29.236.17 -# ceilometer compute agent (telemetry) +# ceilometer compute agent (telemetry data collection) metering-compute_hosts: compute1: ip: 172.29.236.16 diff --git a/playbooks/inventory/env.d/ceilometer.yml b/playbooks/inventory/env.d/ceilometer.yml index 5e046a3479..efb2f465a7 100644 --- a/playbooks/inventory/env.d/ceilometer.yml +++ b/playbooks/inventory/env.d/ceilometer.yml @@ -9,18 +9,14 @@ component_skel: ceilometer_agent_notification: belongs_to: - ceilometer_all - ceilometer_api: - belongs_to: - - ceilometer_all container_skel: - ceilometer_api_container: + ceilometer_central_container: belongs_to: - metering-infra_containers contains: - ceilometer_agent_central - ceilometer_agent_notification - - ceilometer_api properties: service_name: ceilometer metering-compute_container: diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index af86b1dd71..c71259decf 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -28,7 +28,7 @@ vhost: "{{ ceilometer_rabbitmq_vhost }}" _rabbitmq_host_group: "{{ ceilometer_rabbitmq_host_group }}" when: - - inventory_hostname == groups['ceilometer_api'][0] + - inventory_hostname == groups['ceilometer_central_container'][0] - groups[ceilometer_rabbitmq_host_group] | length > 0 - include: common-tasks/os-log-dir-setup.yml vars: diff --git a/playbooks/vars/configs/haproxy_config.yml b/playbooks/vars/configs/haproxy_config.yml index d38a85519c..7ed09d5f13 100644 --- a/playbooks/vars/configs/haproxy_config.yml +++ b/playbooks/vars/configs/haproxy_config.yml @@ -199,14 +199,6 @@ haproxy_default_services: haproxy_balance_type: http haproxy_backend_options: - "httpchk /healthcheck" - - service: - haproxy_service_name: ceilometer_api - haproxy_backend_nodes: "{{ groups['ceilometer_api_container'] | default([]) }}" - haproxy_ssl: "{{ haproxy_ssl }}" - haproxy_port: 8777 - haproxy_balance_type: tcp - haproxy_backend_options: - - tcp-check - service: haproxy_service_name: aodh_api haproxy_backend_nodes: "{{ groups['aodh_api'] | default([]) }}" 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 088a6d3b09..319861cf7e 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -30,7 +30,6 @@ galera_wsrep_provider_options: neutron_metadata_checksum_fix: True ## Set workers for all services to optimise memory usage -ceilometer_api_workers: 2 ceilometer_notification_workers: 2 cinder_osapi_volume_workers: 2 glance_api_threads: 2 diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 4e4199ac62..64c538870c 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -144,12 +144,11 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'barbican_all', 'barbican_api', 'barbican_container', + 'ceilometer_all', 'ceilometer_agent_central', 'ceilometer_agent_compute', 'ceilometer_agent_notification', - 'ceilometer_all', - 'ceilometer_api', - 'ceilometer_api_container', + 'ceilometer_central_container', 'ceph_all', 'ceph-mon_all', 'ceph-mon_containers',