openstack/kolla-ansible
Code Issues Proposed changes

Merge "Support accessing InfluxDB via HAProxy"

Browse Source
This commit is contained in:
Zuul 2018-04-12 11:38:49 +00:00 committed by Gerrit Code Review
commit 12ebf2f40f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/grafana/defaults/main.yml
View File

@ -31,7 +31,7 @@ grafana_data_sources:
database: "telegraf"
name: "telegraf"
type: "influxdb"
url: "{{ internal_protocol }}://{{ api_interface_address }}:{{ influxdb_http_port }}"
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ influxdb_http_port }}"
access: "proxy"
basicAuth: false
elasticsearch:

14
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -153,6 +153,20 @@ listen glance_api_external
{% endif %}
{% endif %}
{% if enable_influxdb | bool %}
listen influxdb_admin
bind {{ kolla_internal_vip_address }}:{{ influxdb_admin_port }}
{% for host in groups['influxdb'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ influxdb_admin_port }} check inter 2000 rise 2 fall 5
{% endfor %}
listen influxdb_http
bind {{ kolla_internal_vip_address }}:{{ influxdb_http_port }}
{% for host in groups['influxdb'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ influxdb_http_port }} check inter 2000 rise 2 fall 5
{% endfor %}
{% endif %}
{% if enable_nova | bool %}
listen nova_api
bind {{ kolla_internal_vip_address }}:{{ nova_api_port }}