From e4087f384b4713de237ff5f48c46b1b2824be699 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 31 Oct 2017 22:16:25 +0800 Subject: [PATCH] Remove the ceilometer api and move bootstrap into notification since the ceilometer-api is marked as deprecated and useless, it should be remove from kolla, but bootstrap action is need, so move it into notification is a good choice. refer to https://github.com/openstack/kolla-ansible/blob/master/releasenotes/notes/remove-ceilometer-useless-service-4e210ddc1c48ac48.yaml#L4 Depends_on: Iea0a46aead14e238fe102d4127b7774dbc2be0e4 Change-Id: Ie8b69e2a0125ea08bb0561991e8e5047bfe47910 --- ansible/inventory/all-in-one | 3 --- ansible/inventory/multinode | 3 --- ansible/roles/ceilometer/defaults/main.yml | 16 ---------------- .../roles/ceilometer/tasks/bootstrap_service.yml | 8 ++++---- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index 5b8ee842f5..02d9110cb2 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -473,9 +473,6 @@ sahara sahara # Ceilometer -[ceilometer-api:children] -ceilometer - [ceilometer-central:children] ceilometer diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 19674ff225..aba24f8041 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -454,9 +454,6 @@ mistral mistral # Ceilometer -[ceilometer-api:children] -ceilometer - [ceilometer-central:children] ceilometer diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml index 5580ebe228..c09dc09e37 100644 --- a/ansible/roles/ceilometer/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/ceilometer/tasks/bootstrap_service.yml b/ansible/roles/ceilometer/tasks/bootstrap_service.yml index c95b2e19bf..5cf6b9e0e7 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap_service.yml +++ b/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] }}"