Remove kafka, storm, zookeeper

Their cleanup has been added to monasca cleanup command.

Change-Id: I19a846e2683ae70b33ca64d2aba7ac71eb724588

README.rst

@@ -100,8 +100,6 @@ Kolla Ansible deploys containers for the following infrastructure components:
 - `RabbitMQ <https://www.rabbitmq.com/>`__ as a messaging backend for
   communication between services.
 - `Redis <https://redis.io/>`__ an in-memory data structure store.
-- `Zookeeper <https://zookeeper.apache.org/>`__ an open-source server which enables
-  highly reliable distributed coordination.
 
 Directories
 ===========

ansible/group_vars/all.yml

@@ -369,8 +369,6 @@ ironic_http_port: "8089"
 
 iscsi_port: "3260"
 
-kafka_port: "9092"
-
 keystone_public_port: "5000"
 keystone_public_listen_port: "{{ keystone_public_port }}"
 # NOTE(yoctozepto): Admin port settings are kept only for upgrade compatibility.
@@ -549,10 +547,6 @@ venus_api_port: "10010"
 
 watcher_api_port: "9322"
 
-zookeeper_client_port: "2181"
-zookeeper_peer_port: "2888"
-zookeeper_quorum_port: "3888"
-
 zun_api_port: "9517"
 zun_wsproxy_port: "6784"
 zun_wsproxy_protocol: "{{ 'wss' if kolla_enable_tls_external | bool else 'ws' }}"
@@ -697,7 +691,6 @@ enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool
 # TODO(yoctozepto): Remove the deprecated enable_ironic_pxe_uefi in Zed.
 enable_ironic_pxe_uefi: "no"
 enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}"
-enable_kafka: "no"
 enable_kuryr: "no"
 enable_magnum: "no"
 enable_manila: "no"
@@ -745,7 +738,6 @@ enable_sahara: "no"
 enable_senlin: "no"
 enable_skydive: "no"
 enable_solum: "no"
-enable_storm: "no"
 enable_swift: "no"
 enable_swift_s3api: "no"
 enable_swift_recon: "no"
@@ -756,7 +748,6 @@ enable_trove_singletenant: "no"
 enable_venus: "no"
 enable_vitrage: "no"
 enable_watcher: "no"
-enable_zookeeper: "{{ enable_kafka | bool or enable_storm | bool }}"
 enable_zun: "no"
 
 ovs_datapath: "{{ 'netdev' if enable_ovs_dpdk | bool else 'system' }}"
@@ -1156,16 +1147,6 @@ influxdb_datadir_volume: "influxdb"
 
 influxdb_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ influxdb_http_port }}"
 
-#################
-# Kafka options
-#################
-kafka_datadir_volume: "kafka"
-
-# The number of brokers in a Kafka cluster. This is used for automatically
-# setting quantities such as topic replicas and it is not recommended to
-# change it unless you know what you are doing.
-kafka_broker_count: "{{ groups['kafka'] | length }}"
-
 #########################
 # Internal Image options
 #########################

ansible/monasca_cleanup.yml

@@ -18,3 +18,17 @@
   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 }

ansible/roles/common/tasks/config.yml

@@ -96,10 +96,6 @@
         enabled: true
       - name: "conf/input/05-libvirt.conf.j2"
         enabled: "{{ enable_nova | bool and enable_nova_libvirt_container | bool }}"
-      - name: "conf/input/06-zookeeper.conf.j2"
-        enabled: true
-      - name: "conf/input/07-kafka.conf.j2"
-        enabled: true
       - name: "conf/input/08-prometheus.conf.j2"
         enabled: "{{ enable_prometheus_fluentd_integration | bool }}"
       - name: "conf/input/10-openvswitch.conf.j2"
@@ -171,7 +167,6 @@
       - { name: "influxdb", enabled: "{{ enable_influxdb | bool }}" }
       - { name: "ironic", enabled: "{{ enable_ironic | bool }}" }
       - { name: "ironic-inspector", enabled: "{{ enable_ironic | bool }}" }
-      - { name: "kafka", enabled: "{{ enable_kafka | bool }}" }
       - { name: "keystone", enabled: "{{ enable_keystone | bool }}" }
       - { name: "kuryr", enabled: "{{ enable_kuryr | bool }}" }
       - { name: "magnum", enabled: "{{ enable_magnum | bool }}" }
@@ -196,14 +191,12 @@
       - { name: "senlin", enabled: "{{ enable_senlin | bool }}" }
       - { name: "skydive", enabled: "{{ enable_skydive | bool }}" }
       - { name: "solum", enabled: "{{ enable_solum | bool }}" }
-      - { name: "storm", enabled: "{{ enable_storm | bool }}" }
       - { name: "swift", enabled: "{{ enable_swift | bool }}" }
       - { name: "tacker", enabled: "{{ enable_tacker | bool }}" }
       - { name: "trove", enabled: "{{ enable_trove | bool }}" }
       - { name: "venus", enabled: "{{ enable_venus | bool }}" }
       - { name: "vitrage", enabled: "{{ enable_vitrage | bool }}" }
       - { name: "watcher", enabled: "{{ enable_watcher | bool }}" }
-      - { name: "zookeeper", enabled: "{{ enable_zookeeper | bool }}" }
       - { name: "zun", enabled: "{{ enable_zun | bool }}" }
   template:
     src: "cron-logrotate-global.conf.j2"

ansible/roles/destroy/tasks/cleanup_host.yml

@@ -9,7 +9,6 @@
     nova_instance_datadir_volume: "{{ nova_instance_datadir_volume }}"
     gnocchi_metric_datadir_volume: "{{ gnocchi_metric_datadir_volume }}"
     influxdb_datadir_volume: "{{ influxdb_datadir_volume }}"
-    kafka_datadir_volume: "{{ kafka_datadir_volume }}"
     kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
     kolla_external_vip_address: "{{ kolla_external_vip_address }}"
     kolla_dev_repos_directory: "{{ kolla_dev_repos_directory }}"

ansible/roles/kafka/defaults/main.yml

@@ -3,7 +3,7 @@ kafka_services:
   kafka:
     container_name: kafka
     group: kafka
-    enabled: true
+    enabled: false
     image: "{{ kafka_image_full }}"
     environment:
       LOG_DIR: "{{ kafka_log_dir }}"
@@ -13,14 +13,6 @@ kafka_services:
     healthcheck: "{{ kafka_healthcheck }}"
 
 
-####################
-# Kafka
-####################
-kafka_cluster_name: "kolla_kafka"
-kafka_log_dir: "/var/log/kolla/kafka"
-kafka_heap_opts: "-Xmx1G -Xms1G"
-kafka_zookeeper: "{% for host in groups['zookeeper'] %}{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ zookeeper_client_port }}{% if not loop.last %},{% endif %}{% endfor %}"
-
 ####################
 # Docker
 ####################

ansible/roles/kafka/tasks/cleanup.yml

@@ -0,0 +1,22 @@
+---
+- 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