openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove redundant Monasca Kafka client option"

Browse Source
This commit is contained in:
Zuul 2021-08-11 11:40:12 +00:00 committed by Gerrit Code Review
commit 6dff0305c0
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/monasca/templates/monasca-api/api.conf.j2
View File

@ -17,9 +17,6 @@ ip_address = {{ monasca_influxdb_address }}
port = {{ monasca_influxdb_http_port }} port = {{ monasca_influxdb_http_port }}
[kafka] [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 }} metrics_topic = {{ monasca_metrics_topic }}
logs_topics = {{ monasca_raw_logs_topic }} logs_topics = {{ monasca_raw_logs_topic }}
uri = {{ monasca_kafka_servers }} uri = {{ monasca_kafka_servers }}

3
ansible/roles/monasca/templates/monasca-notification/notification.conf.j2
View File

@ -9,9 +9,6 @@ alarm_topic = {{ monasca_alarm_state_transitions_topic }}
notification_topic = {{ monasca_alarm_notifications_topic }} notification_topic = {{ monasca_alarm_notifications_topic }}
notification_retry_topic = {{ monasca_alarm_notifications_retry_topic }} notification_retry_topic = {{ monasca_alarm_notifications_retry_topic }}
periodic = {{ monasca_periodic_notifications_period }}:{{ monasca_periodic_notifications_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] [mysql]
host = {{ monasca_database_address }} host = {{ monasca_database_address }}

5
ansible/roles/monasca/templates/monasca-persister/persister.conf.j2
View File

@ -9,11 +9,6 @@ database_name = {{ monasca_influxdb_name }}
ip_address = {{ kolla_internal_vip_address }} ip_address = {{ kolla_internal_vip_address }}
port = {{ monasca_influxdb_http_port }} 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] [kafka_alarm_history]
{% if not monasca_enable_alerting_pipeline | bool %} {% if not monasca_enable_alerting_pipeline | bool %}
enabled = False enabled = False