From 2b3284b3f33f0ecdd5b16520412e75dc3baf4baf Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Tue, 27 Apr 2021 11:19:48 +0000
Subject: [PATCH] Remove redundant Monasca Kafka client option

This override is now the default.

Change-Id: I98cbf71532b2bc068ab4f34e648a5dad15139f6f
---
 ansible/roles/monasca/templates/monasca-api/api.conf.j2      | 3 ---
 .../templates/monasca-notification/notification.conf.j2      | 3 ---
 .../monasca/templates/monasca-persister/persister.conf.j2    | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/ansible/roles/monasca/templates/monasca-api/api.conf.j2 b/ansible/roles/monasca/templates/monasca-api/api.conf.j2
index 9233c7ad33..c18ac97d9f 100644
--- a/ansible/roles/monasca/templates/monasca-api/api.conf.j2
+++ b/ansible/roles/monasca/templates/monasca-api/api.conf.j2
@@ -17,9 +17,6 @@ ip_address = {{ monasca_influxdb_address }}
 port = {{ monasca_influxdb_http_port }}
 
 [kafka]
-# NOTE(dszumski): This will become the default in Victoria and can then
-# be removed: https://review.opendev.org/#/c/740954
-legacy_kafka_client_enabled = False
 metrics_topic = {{ monasca_metrics_topic }}
 logs_topics = {{ monasca_raw_logs_topic }}
 uri = {{ monasca_kafka_servers }}
diff --git a/ansible/roles/monasca/templates/monasca-notification/notification.conf.j2 b/ansible/roles/monasca/templates/monasca-notification/notification.conf.j2
index 97d8931def..ce934eea12 100644
--- a/ansible/roles/monasca/templates/monasca-notification/notification.conf.j2
+++ b/ansible/roles/monasca/templates/monasca-notification/notification.conf.j2
@@ -9,9 +9,6 @@ alarm_topic = {{ monasca_alarm_state_transitions_topic }}
 notification_topic = {{ monasca_alarm_notifications_topic }}
 notification_retry_topic = {{ monasca_alarm_notifications_retry_topic }}
 periodic = {{ monasca_periodic_notifications_period }}:{{ monasca_periodic_notifications_topic }}
-# NOTE(dszumski): This will become the default in Victoria and can then
-# be removed: https://review.opendev.org/#/c/740959
-legacy_kafka_client_enabled = False
 
 [mysql]
 host = {{ monasca_database_address }}
diff --git a/ansible/roles/monasca/templates/monasca-persister/persister.conf.j2 b/ansible/roles/monasca/templates/monasca-persister/persister.conf.j2
index 7f0d229694..f0d1a602da 100644
--- a/ansible/roles/monasca/templates/monasca-persister/persister.conf.j2
+++ b/ansible/roles/monasca/templates/monasca-persister/persister.conf.j2
@@ -9,11 +9,6 @@ database_name = {{ monasca_influxdb_name }}
 ip_address = {{ kolla_internal_vip_address }}
 port = {{ monasca_influxdb_http_port }}
 
-[kafka]
-# NOTE(dszumski): This will become the default in Victoria and can then
-# be removed: https://review.opendev.org/#/c/740966
-legacy_kafka_client_enabled = False
-
 [kafka_alarm_history]
 {% if not monasca_enable_alerting_pipeline | bool %}
 enabled = False