Merge "Remove the ceilometer api and move bootstrap into notification"

ansible/inventory/all-in-one

@@ -486,9 +486,6 @@ sahara
 sahara
 
 # Ceilometer
-[ceilometer-api:children]
-ceilometer
-
 [ceilometer-central:children]
 ceilometer
 

ansible/inventory/multinode

@@ -468,9 +468,6 @@ mistral
 mistral
 
 # Ceilometer
-[ceilometer-api:children]
-ceilometer
-
 [ceilometer-central:children]
 ceilometer
 

ansible/roles/ceilometer/defaults/main.yml

@@ -2,17 +2,6 @@
 project_name: "ceilometer"
 
 ceilometer_services:
-# TODO(jeffrey4l): ceilometer_api_image is still required for bootstrap service. Remove this after use ceilometer notification image instead
-  ceilometer-api:
-    container_name: ceilometer_api
-    group: ceilometer-api
-    enabled: True
-    image: "{{ ceilometer_api_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/ceilometer-api/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "ceilometer:/var/lib/ceilometer/"
-      - "kolla_logs:/var/log/kolla/"
   ceilometer-notification:
     container_name: ceilometer_notification
     group: ceilometer-notification
@@ -57,11 +46,6 @@ ceilometer_notification_image: "{{ docker_registry ~ '/' if docker_registry else
 ceilometer_notification_tag: "{{ ceilometer_tag }}"
 ceilometer_notification_image_full: "{{ ceilometer_notification_image }}:{{ ceilometer_notification_tag }}"
 
-# TODO(jeffrey4l): ceilometer_api_image is still required for bootstrap service. Remove this after use ceilometer notification image instead
-ceilometer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ ceilometer_install_type }}-ceilometer-api"
-ceilometer_api_tag: "{{ ceilometer_tag }}"
-ceilometer_api_image_full: "{{ ceilometer_api_image }}:{{ ceilometer_api_tag }}"
-
 ceilometer_central_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ ceilometer_install_type }}-ceilometer-central"
 ceilometer_central_tag: "{{ ceilometer_tag }}"
 ceilometer_central_image_full: "{{ ceilometer_central_image }}:{{ ceilometer_central_tag }}"

ansible/roles/ceilometer/tasks/bootstrap_service.yml

@@ -1,7 +1,7 @@
 ---
 - name: Running Ceilometer bootstrap container
   vars:
-    ceilometer_api: "{{ ceilometer_services['ceilometer-api'] }}"
+    ceilometer_notification: "{{ ceilometer_services['ceilometer-notification'] }}"
   kolla_docker:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
@@ -10,11 +10,11 @@
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
       CEILOMETER_DATABASE_TYPE: "gnocchi"
-    image: "{{ ceilometer_api.image }}"
+    image: "{{ ceilometer_notification.image }}"
     labels:
       BOOTSTRAP:
     name: "bootstrap_ceilometer"
     restart_policy: "never"
-    volumes: "{{ ceilometer_api.volumes }}"
+    volumes: "{{ ceilometer_notification.volumes }}"
   run_once: True
-  delegate_to: "{{ groups[ceilometer_api.group][0] }}"
+  delegate_to: "{{ groups[ceilometer_notification.group][0] }}"