openstack
/
kolla-ansible
Code Issues Proposed changes

Remove remnants of Monasca and deps 

Following Monasca initial removal in [1]

[1]: I6fc7842bcda18e417a3fd21c11e28979a470f1cf

Change-Id: I94d6f102e8da3882f37f3007639b917c49f907a9
This commit is contained in:
Michal Nasiadka 2023-10-02 10:16:35 +02:00
parent 28bf63f269
commit 00dfa4233c
20 changed files with 5 additions and 652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/group_vars/all.yml
View File

@ -611,15 +611,6 @@ solum_image_builder_port: "9778"
solum_image_builder_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else solum_image_builder_port }}"
solum_image_builder_listen_port: "{{ solum_image_builder_port }}"
storm_nimbus_thrift_port: 6627
storm_supervisor_thrift_port: 6628
# Storm will run up to (end - start) + 1 workers per worker host. Here
# we reserve ports for those workers, and implicitly define the maximum
# number of workers per host.
storm_worker_port_range:
start: 6700
end: 6703
swift_internal_fqdn: "{{ kolla_internal_fqdn }}"
swift_external_fqdn: "{{ kolla_external_fqdn }}"
swift_proxy_server_port: "8080"

54
ansible/inventory/all-in-one
View File

@ -43,9 +43,6 @@ monitoring
[etcd:children]
control
[kafka:children]
control
[telegraf:children]
compute
control
@ -71,19 +68,6 @@ control
[outward-rabbitmq:children]
control
[monasca-agent:children]
compute
control
monitoring
network
storage
[monasca:children]
monitoring
[storm:children]
monitoring
[keystone:children]
control
@ -192,9 +176,6 @@ control
[bifrost:children]
deployment
[zookeeper:children]
control
[zun:children]
control
@ -397,41 +378,6 @@ murano
[murano-engine:children]
murano
# Monasca
[monasca-agent-collector:children]
monasca-agent
[monasca-agent-forwarder:children]
monasca-agent
[monasca-agent-statsd:children]
monasca-agent
[monasca-api:children]
monasca
[monasca-log-persister:children]
monasca
[monasca-log-metrics:children]
monasca
[monasca-thresh:children]
monasca
[monasca-notification:children]
monasca
[monasca-persister:children]
monasca
# Storm
[storm-worker:children]
storm
[storm-nimbus:children]
storm
# Ironic
[ironic-api:children]
ironic

54
ansible/inventory/multinode
View File

@ -67,9 +67,6 @@ monitoring
[prometheus:children]
monitoring
[kafka:children]
control
[telegraf:children]
compute
control
@ -95,19 +92,6 @@ control
[outward-rabbitmq:children]
control
[monasca-agent:children]
compute
control
monitoring
network
storage
[monasca:children]
monitoring
[storm:children]
monitoring
[keystone:children]
control
@ -210,9 +194,6 @@ control
[bifrost:children]
deployment
[zookeeper:children]
control
[zun:children]
control
@ -406,41 +387,6 @@ murano
[murano-engine:children]
murano
# Monasca
[monasca-agent-collector:children]
monasca-agent
[monasca-agent-forwarder:children]
monasca-agent
[monasca-agent-statsd:children]
monasca-agent
[monasca-api:children]
monasca
[monasca-log-persister:children]
monasca
[monasca-log-metrics:children]
monasca
[monasca-thresh:children]
monasca
[monasca-notification:children]
monasca
[monasca-persister:children]
monasca
# Storm
[storm-worker:children]
storm
[storm-nimbus:children]
storm
# Ironic
[ironic-api:children]
ironic

34
ansible/monasca_cleanup.yml
View File

@ -1,34 +0,0 @@
---
- name: Cleanup unused Monasca services
hosts:
- monasca-api
- monasca-log-persister
- monasca-log-metrics
- monasca-thresh
- monasca-notification
- monasca-persister
roles:
- { role: monasca,
tags: monasca }
- name: Cleanup unused Storm services
hosts:
- storm-worker
- storm-nimbus
roles:
- { role: storm,
tags: storm }
- name: Cleanup unused Zookeeper services
hosts:
- zookeeper
roles:
- { role: zookeeper,
tags: zookeeper }
- name: Cleanup unused Kafka services
hosts:
- kafka
roles:
- { role: kafka,
tags: kafka }

43
ansible/roles/kafka/defaults/main.yml
View File

@ -1,43 +0,0 @@
---
kafka_services:
kafka:
container_name: kafka
group: kafka
enabled: false
image: "{{ kafka_image_full }}"
environment:
LOG_DIR: "{{ kafka_log_dir }}"
KAFKA_HEAP_OPTS: "{{ kafka_heap_opts }}"
volumes: "{{ kafka_default_volumes + kafka_extra_volumes }}"
dimensions: "{{ kafka_dimensions }}"
healthcheck: "{{ kafka_healthcheck }}"
####################
# Docker
####################
kafka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/kafka"
kafka_tag: "{{ openstack_tag }}"
kafka_image_full: "{{ kafka_image }}:{{ kafka_tag }}"
kafka_dimensions: "{{ default_container_dimensions }}"
kafka_enable_healthchecks: "{{ enable_container_healthchecks }}"
kafka_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
kafka_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
kafka_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
kafka_healthcheck_test: ["CMD-SHELL", "healthcheck_listen java {{ kafka_port }}"]
kafka_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
kafka_healthcheck:
interval: "{{ kafka_healthcheck_interval }}"
retries: "{{ kafka_healthcheck_retries }}"
start_period: "{{ kafka_healthcheck_start_period }}"
test: "{% if kafka_enable_healthchecks | bool %}{{ kafka_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ kafka_healthcheck_timeout }}"
kafka_default_volumes:
- "{{ node_config_directory }}/kafka/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "{{ kafka_datadir_volume }}:/var/lib/kafka/data"
- "kolla_logs:/var/log/kolla/"
kafka_extra_volumes: "{{ default_extra_volumes }}"

22
ansible/roles/kafka/tasks/cleanup.yml
View File

@ -1,22 +0,0 @@
---
- name: Stop and remove containers for disabled kafka services
become: true
kolla_docker:
action: "stop_and_remove_container"
name: "{{ item.value.container_name }}"
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ kafka_services }}"
- name: Removing config for any disabled services
file:
path: "{{ node_config_directory }}/{{ item.key }}"
state: "absent"
become: true
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ kafka_services }}"
# NOTE(dszumski): Docker volume removal is currently a manual procedure

1
ansible/roles/kafka/tasks/config_validate.yml
View File

@ -1 +0,0 @@
---

185
ansible/roles/monasca/defaults/main.yml
View File

@ -1,185 +0,0 @@
---
monasca_services:
monasca-api:
container_name: monasca_api
group: monasca-api
enabled: false
image: "{{ monasca_api_image_full }}"
volumes: "{{ monasca_api_default_volumes + monasca_api_extra_volumes }}"
dimensions: "{{ monasca_api_dimensions }}"
haproxy:
monasca_api:
enabled: false
mode: "http"
external: false
port: "{{ monasca_api_port }}"
listen_port: "{{ monasca_api_listen_port }}"
monasca_api_external:
enabled: false
mode: "http"
external: true
external_fqdn: "{{ monasca_external_fqdn }}"
port: "{{ monasca_api_public_port }}"
listen_port: "{{ monasca_api_listen_port }}"
monasca-log-persister:
container_name: monasca_log_persister
group: monasca-log-persister
enabled: false
image: "{{ monasca_logstash_image_full }}"
volumes: "{{ monasca_log_persister_default_volumes + monasca_log_persister_extra_volumes }}"
dimensions: "{{ monasca_log_persister_dimensions }}"
# TODO(dszumski): We can remove log-metrics and all other references to it after
# the Xena release. This is used for cleaning up the service.
monasca-log-metrics:
container_name: monasca_log_metrics
group: monasca-log-metrics
enabled: false
image: "{{ monasca_logstash_image_full }}"
volumes: "{{ monasca_log_metrics_default_volumes + monasca_log_metrics_extra_volumes }}"
dimensions: "{{ monasca_log_metrics_dimensions }}"
monasca-thresh:
container_name: monasca_thresh
group: monasca-thresh
enabled: false
image: "{{ monasca_thresh_image_full }}"
volumes: "{{ monasca_thresh_default_volumes + monasca_thresh_extra_volumes }}"
dimensions: "{{ monasca_thresh_dimensions }}"
state: "exited"
monasca-notification:
container_name: monasca_notification
group: monasca-notification
enabled: false
image: "{{ monasca_notification_image_full }}"
volumes: "{{ monasca_notification_default_volumes + monasca_notification_extra_volumes }}"
dimensions: "{{ monasca_notification_dimensions }}"
monasca-persister:
container_name: monasca_persister
group: monasca-persister
enabled: false
image: "{{ monasca_persister_image_full }}"
volumes: "{{ monasca_persister_default_volumes + monasca_persister_extra_volumes }}"
dimensions: "{{ monasca_persister_dimensions }}"
monasca-agent-collector:
container_name: monasca_agent_collector
group: monasca-agent-collector
enabled: false
image: "{{ monasca_agent_image_full }}"
pid_mode: "host"
volumes: "{{ monasca_agent_collector_default_volumes + monasca_agent_collector_extra_volumes }}"
dimensions: "{{ monasca_agent_dimensions }}"
monasca-agent-statsd:
container_name: monasca_agent_statsd
group: monasca-agent-statsd
enabled: false
image: "{{ monasca_agent_image_full }}"
volumes: "{{ monasca_agent_statsd_default_volumes + monasca_agent_statsd_extra_volumes }}"
dimensions: "{{ monasca_agent_dimensions }}"
monasca-agent-forwarder:
container_name: monasca_agent_forwarder
group: monasca-agent-forwarder
enabled: false
image: "{{ monasca_agent_image_full }}"
volumes: "{{ monasca_agent_forwarder_default_volumes + monasca_agent_forwarder_extra_volumes }}"
dimensions: "{{ monasca_agent_dimensions }}"
####################
# Docker
####################
# NOTE(dszumski): Binary support for Monasca images is not yet available in Kolla
monasca_tag: "{{ openstack_tag }}"
monasca_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/monasca-agent"
monasca_agent_tag: "{{ monasca_tag }}"
monasca_agent_image_full: "{{ monasca_agent_image }}:{{ monasca_agent_tag }}"
monasca_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/monasca-api"
monasca_api_tag: "{{ monasca_tag }}"
monasca_api_image_full: "{{ monasca_api_image }}:{{ monasca_api_tag }}"
monasca_logstash_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/logstash"
monasca_logstash_tag: "{{ monasca_tag }}"
monasca_logstash_image_full: "{{ monasca_logstash_image }}:{{ monasca_logstash_tag }}"
monasca_thresh_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/monasca-thresh"
monasca_thresh_tag: "{{ monasca_tag }}"
monasca_thresh_image_full: "{{ monasca_thresh_image }}:{{ monasca_thresh_tag }}"
monasca_notification_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/monasca-notification"
monasca_notification_tag: "{{ monasca_tag }}"
monasca_notification_image_full: "{{ monasca_notification_image }}:{{ monasca_notification_tag }}"
monasca_persister_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/monasca-persister"
monasca_persister_tag: "{{ monasca_tag }}"
monasca_persister_image_full: "{{ monasca_persister_image }}:{{ monasca_persister_tag }}"
monasca_agent_dimensions: "{{ default_container_dimensions }}"
monasca_api_dimensions: "{{ default_container_dimensions }}"
monasca_log_api_dimensions: "{{ default_container_dimensions }}"
monasca_log_persister_dimensions: "{{ default_container_dimensions }}"
monasca_log_metrics_dimensions: "{{ default_container_dimensions }}"
monasca_thresh_dimensions: "{{ default_container_dimensions }}"
monasca_notification_dimensions: "{{ default_container_dimensions }}"
monasca_persister_dimensions: "{{ default_container_dimensions }}"
monasca_agent_collector_default_volumes:
- "{{ node_config_directory }}/monasca-agent-collector/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
- "/sys:/sys:ro"
- "/dev/disk/:/dev/disk:ro"
monasca_agent_statsd_default_volumes:
- "{{ node_config_directory }}/monasca-agent-statsd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
monasca_agent_forwarder_default_volumes:
- "{{ node_config_directory }}/monasca-agent-forwarder/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
monasca_api_default_volumes:
- "{{ node_config_directory }}/monasca-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
monasca_log_persister_default_volumes:
- "{{ node_config_directory }}/monasca-log-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
- "monasca_log_persister_data:/var/lib/logstash"
monasca_log_metrics_default_volumes:
- "{{ node_config_directory }}/monasca-log-metrics/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
- "monasca_log_metrics_data:/var/lib/logstash"
monasca_thresh_default_volumes:
- "{{ node_config_directory }}/monasca-thresh/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "monasca_thresh:/var/lib/monasca-thresh/"
- "kolla_logs:/var/log/kolla"
monasca_notification_default_volumes:
- "{{ node_config_directory }}/monasca-notification/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
monasca_persister_default_volumes:
- "{{ node_config_directory }}/monasca-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla"
monasca_extra_volumes: "{{ default_extra_volumes }}"
monasca_agent_collector_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_agent_statsd_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_agent_forwarder_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_api_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_log_persister_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_log_metrics_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_thresh_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_notification_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_persister_extra_volumes: "{{ monasca_extra_volumes }}"

22
ansible/roles/monasca/tasks/cleanup.yml
View File

@ -1,22 +0,0 @@
---
- name: Stop and remove containers for disabled monasca services
become: true
kolla_docker:
action: "stop_and_remove_container"
name: "{{ item.value.container_name }}"
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ monasca_services }}"
- name: Removing config for any disabled services
file:
path: "{{ node_config_directory }}/{{ item.key }}"
state: "absent"
become: true
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ monasca_services }}"
# NOTE(dszumski): Docker volume removal is currently a manual procedure

78
ansible/roles/storm/defaults/main.yml
View File

@ -1,78 +0,0 @@
---
storm_services:
storm-worker:
container_name: storm_worker
group: storm-worker
enabled: false
image: "{{ storm_image_full }}"
environment:
STORM_LOG_DIR: /var/log/kolla/storm
STORM_LOG4J_PROP: "{{ storm_log_settings }}"
volumes: "{{ storm_worker_default_volumes + storm_nimbus_extra_volumes }}"
dimensions: "{{ storm_worker_dimensions }}"
healthcheck: "{{ storm_worker_healthcheck }}"
storm-nimbus:
container_name: storm_nimbus
group: storm-nimbus
enabled: false
image: "{{ storm_image_full }}"
environment:
STORM_LOG_DIR: /var/log/kolla/storm
STORM_LOG4J_PROP: "{{ storm_log_settings }}"
volumes: "{{ storm_nimbus_default_volumes + storm_nimbus_extra_volumes }}"
dimensions: "{{ storm_nimbus_dimensions }}"
healthcheck: "{{ storm_nimbus_healthcheck }}"
####################
# Docker
####################
storm_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/storm"
storm_tag: "{{ openstack_tag }}"
storm_image_full: "{{ storm_image }}:{{ storm_tag }}"
storm_worker_dimensions: "{{ default_container_dimensions }}"
storm_nimbus_dimensions: "{{ default_container_dimensions }}"
storm_worker_enable_healthchecks: "{{ enable_container_healthchecks }}"
storm_worker_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
storm_worker_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
storm_worker_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
storm_worker_healthcheck_test: ["CMD-SHELL", "healthcheck_port java {{ zookeeper_client_port }}"]
storm_worker_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
storm_worker_healthcheck:
interval: "{{ storm_worker_healthcheck_interval }}"
retries: "{{ storm_worker_healthcheck_retries }}"
start_period: "{{ storm_worker_healthcheck_start_period }}"
test: "{% if storm_worker_enable_healthchecks | bool %}{{ storm_worker_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ storm_worker_healthcheck_timeout }}"
storm_nimbus_enable_healthchecks: "{{ enable_container_healthchecks }}"
storm_nimbus_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
storm_nimbus_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
storm_nimbus_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
storm_nimbus_healthcheck_test: ["CMD-SHELL", "healthcheck_listen java {{ storm_nimbus_thrift_port }}"]
storm_nimbus_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
storm_nimbus_healthcheck:
interval: "{{ storm_nimbus_healthcheck_interval }}"
retries: "{{ storm_nimbus_healthcheck_retries }}"
start_period: "{{ storm_nimbus_healthcheck_start_period }}"
test: "{% if storm_nimbus_enable_healthchecks | bool %}{{ storm_nimbus_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ storm_nimbus_healthcheck_timeout }}"
storm_worker_default_volumes:
- "{{ node_config_directory }}/storm-worker/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "storm:/var/lib/storm/data"
- "kolla_logs:/var/log/kolla/"
storm_nimbus_default_volumes:
- "{{ node_config_directory }}/storm-nimbus/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "storm:/var/lib/storm/data"
- "kolla_logs:/var/log/kolla/"
storm_extra_volumes: "{{ default_extra_volumes }}"
storm_worker_extra_volumes: "{{ storm_extra_volumes }}"
storm_nimbus_extra_volumes: "{{ storm_extra_volumes }}"

22
ansible/roles/storm/tasks/cleanup.yml
View File

@ -1,22 +0,0 @@
---
- name: Stop and remove containers for disabled storm services
become: true
kolla_docker:
action: "stop_and_remove_container"
name: "{{ item.value.container_name }}"
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ storm_services }}"
- name: Removing config for any disabled services
file:
path: "{{ node_config_directory }}/{{ item.key }}"
state: "absent"
become: true
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ storm_services }}"
# NOTE(dszumski): Docker volume removal is currently a manual procedure

1
ansible/roles/storm/tasks/config_validate.yml
View File

@ -1 +0,0 @@
---

44
ansible/roles/zookeeper/defaults/main.yml
View File

@ -1,44 +0,0 @@
---
zookeeper_services:
zookeeper:
container_name: zookeeper
group: zookeeper
enabled: false
image: "{{ zookeeper_image_full }}"
environment:
ZOO_LOG_DIR: /var/log/kolla/zookeeper
ZOO_LOG4J_PROP: "{{ zookeeper_log_settings }}"
volumes: "{{ zookeeper_default_volumes + zookeeper_extra_volumes }}"
dimensions: "{{ zookeeper_dimensions }}"
healthcheck: "{{ zookeeper_healthcheck }}"
####################
# Docker
####################
zookeeper_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/zookeeper"
zookeeper_tag: "{{ openstack_tag }}"
zookeeper_image_full: "{{ zookeeper_image }}:{{ zookeeper_tag }}"
zookeeper_dimensions: "{{ default_container_dimensions }}"
zookeeper_enable_healthchecks: "{{ enable_container_healthchecks }}"
zookeeper_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
zookeeper_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
zookeeper_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
zookeeper_healthcheck_test: ["CMD-SHELL", "healthcheck_listen java {{ zookeeper_client_port }}"]
zookeeper_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
zookeeper_healthcheck:
interval: "{{ zookeeper_healthcheck_interval }}"
retries: "{{ zookeeper_healthcheck_retries }}"
start_period: "{{ zookeeper_healthcheck_start_period }}"
test: "{% if zookeeper_enable_healthchecks | bool %}{{ zookeeper_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ zookeeper_healthcheck_timeout }}"
zookeeper_default_volumes:
- "{{ node_config_directory }}/zookeeper/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "zookeeper:/var/lib/zookeeper/data"
- "kolla_logs:/var/log/kolla/"
zookeeper_extra_volumes: "{{ default_extra_volumes }}"

22
ansible/roles/zookeeper/tasks/cleanup.yml
View File

@ -1,22 +0,0 @@
---
- name: Stop and remove containers for disabled zookeeper services
become: true
kolla_docker:
action: "stop_and_remove_container"
name: "{{ item.value.container_name }}"
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ zookeeper_services }}"
- name: Removing config for any disabled services
file:
path: "{{ node_config_directory }}/{{ item.key }}"
state: "absent"
become: true
when:
- inventory_hostname in groups[item.value.group]
- not item.value.enabled | bool
with_dict: "{{ zookeeper_services }}"
# NOTE(dszumski): Docker volume removal is currently a manual procedure

1
ansible/roles/zookeeper/tasks/config_validate.yml
View File

@ -1 +0,0 @@
---

1
doc/source/reference/logging-and-monitoring/index.rst
View File

@ -11,6 +11,5 @@ logging and monitoring services available in kolla.
central-logging-guide
grafana-guide
influxdb-guide
monasca-guide
osprofiler-guide
prometheus-guide

49
doc/source/reference/logging-and-monitoring/monasca-guide.rst
View File

@ -1,49 +0,0 @@
.. _monasca-guide:
============================
Monasca - Monitoring service
============================
Overview
~~~~~~~~
Following a decline in activity within the OpenStack Monasca project,
Kolla Ansible has decided to remove support for deploying it. Advice
for removing it is included in the cleanup section below.
Cleanup
~~~~~~~
The cleanup command can be invoked from the Kolla Ansible CLI, for example:
.. code-block:: console
kolla-ansible monasca_cleanup
This will remove Monasca service containers (including Kafka, Storm and
ZooKeeper), and service configuration.
Following cleanup, you may also choose to remove unused container volumes.
It is recommended to run this manually on each Monasca service host. Note
that `docker prune` will indiscriminately remove all unused volumes,
which may not always be what you want. If you wish to keep a subset of
unused volumes, you can remove them individually.
To remove all unused volumes on a host:
.. code-block:: console
docker prune
To remove a single unused volume, run for example:
.. code-block:: console
docker volume rm monasca_log_transformer_data
Assignee
~~~~~~~~
Monasca support in Kolla was contributed by StackHPC Ltd. and the Kolla
community. If you have any issues with the deployment please ask in the
Kolla IRC channel.

5
releasenotes/notes/drop-monasca-final-711062c7ce307327.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Remnants of Monasca, Storm, Kafka and Zookeeper have been removed
(including ``kolla-ansible monasca_cleanup`` command).

3
tests/templates/inventory.j2
View File

@ -246,9 +246,6 @@ control
[bifrost:children]
deployment
[zookeeper:children]
control
[zun:children]
control

7
tools/kolla-ansible
View File

@ -181,7 +181,6 @@ Commands:
mariadb_backup Take a backup of MariaDB databases
--full (default)
--incremental
monasca_cleanup Remove unused containers for the Monasca service
bootstrap-servers Bootstrap servers with kolla deploy dependencies
destroy Destroy Kolla containers, volumes and host configuration
--include-images to also destroy Kolla images
@ -232,7 +231,6 @@ install-deps
prechecks
mariadb_recovery
mariadb_backup
monasca_cleanup
bootstrap-servers
destroy
deploy
@ -449,11 +447,6 @@ case "$1" in
EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=backup -e mariadb_backup_type=${BACKUP_TYPE}"
PLAYBOOK="${BASEDIR}/ansible/mariadb_backup.yml"
;;
(monasca_cleanup)
ACTION="Cleanup unused Monasca services"
EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=cleanup"
PLAYBOOK="${BASEDIR}/ansible/monasca_cleanup.yml"
;;
(destroy)
ACTION="Destroy Kolla containers, volumes and host configuration"
PLAYBOOK="${BASEDIR}/ansible/destroy.yml"