Merge "Remove Ceilometer API Service"

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

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

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

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:

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:

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([]) }}"

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

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