openstack/kolla-ansible
Code Issues Proposed changes

Merge "Standardise Monasca Kafka variable name"

Browse Source
This commit is contained in:
Zuul 2018-07-05 12:41:54 +00:00 committed by Gerrit Code Review
commit bbacab5fb2
3 changed files with 4 additions and 4 deletions
ansible/roles/monasca
defaults
main.yml
templates
monasca-api
api-config.conf.j2
monasca-log-api
log-api.conf.j2

2
ansible/roles/monasca/defaults/main.yml

@ -33,7 +33,7 @@ monasca_influxdb_http_port: "{{ influxdb_http_port }}"
####################
# Monasca
####################
monasca_kafka: "{% for host in groups['kafka'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kafka_port }}{% if not loop.last %},{% endif %}{% endfor %}"
monasca_kafka_servers: "{% for host in groups['kafka'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kafka_port }}{% if not loop.last %},{% endif %}{% endfor %}"
monasca_memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
monasca_metrics_topic: "metrics"

2
ansible/roles/monasca/templates/monasca-api/api-config.conf.j2

@ -16,7 +16,7 @@ port = {{ monasca_influxdb_http_port }}
[kafka]
metrics_topic = {{ monasca_metrics_topic }}
partitions = 0
uri = {{ monasca_kafka }}
uri = {{ monasca_kafka_servers }}
[messaging]
driver = monasca_api.common.messaging.kafka_publisher:KafkaPublisher

4
ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2

@ -5,11 +5,11 @@ debug = {{ monasca_logging_debug }}
[kafka_healthcheck]
kafka_topics = {{ monasca_raw_logs_topic }}
kafka_url = {{ monasca_kafka }}
kafka_url = {{ monasca_kafka_servers }}
[log_publisher]
topics = {{ monasca_raw_logs_topic }}
kafka_url = {{ monasca_kafka }}
kafka_url = {{ monasca_kafka_servers }}
[monitoring]
# TODO(dszumski): Deploy statsd to use this