diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-05 12:41:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-05 12:41:54 +0000 |
| commit | bbacab5fb28f98c354975bef5c26243d3ef87494 (patch) | |
| tree | 8e15886c6e08a0703741a668bb3f94e4b6f9cd3f /ansible | |
| parent | 344ee2fc571529467961b8e0d28420fb1baeccae (diff) | |
| parent | b54ceef8bfef643ee9ee73f29858b2f148a81913 (diff) | |
| download | kolla-ansible-bbacab5fb28f98c354975bef5c26243d3ef87494.tar.gz kolla-ansible-bbacab5fb28f98c354975bef5c26243d3ef87494.zip | |
Merge "Standardise Monasca Kafka variable name"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/monasca/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/monasca/templates/monasca-api/api-config.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml index ac8142129..b5fc75a69 100644 --- a/ansible/roles/monasca/defaults/main.yml +++ b/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" diff --git a/ansible/roles/monasca/templates/monasca-api/api-config.conf.j2 b/ansible/roles/monasca/templates/monasca-api/api-config.conf.j2 index d78c1c7a9..4d542dbb9 100644 --- a/ansible/roles/monasca/templates/monasca-api/api-config.conf.j2 +++ b/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 diff --git a/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 b/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 index c542060a2..3ca06dcbb 100644 --- a/ansible/roles/monasca/templates/monasca-log-api/log-api.conf.j2 +++ b/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 |