openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add kibana authentication using HAproxy"

Browse Source
This commit is contained in:
Jenkins 2016-03-25 10:53:57 +00:00 committed by Gerrit Code Review
commit beaee72f0f
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/group_vars/all.yml
View File

@ -210,6 +210,13 @@ haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_int
kolla_enable_tls_external: "no" kolla_enable_tls_external: "no"
kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
####################
# Kibana options
####################
kibana_user: "kibana"
################################# #################################
# Cinder - Block Storage options # Cinder - Block Storage options
################################# #################################

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

@ -374,8 +374,14 @@ listen radosgw_external
{% endif %} {% endif %}
{% if enable_central_logging | bool %} {% if enable_central_logging | bool %}
userlist kibanauser
user {{ kibana_user }} insecure-password {{ kibana_password }}
listen kibana listen kibana
bind {{ kolla_internal_vip_address }}:{{ kibana_server_port }} bind {{ kolla_internal_vip_address }}:{{ kibana_server_port }}
acl auth_acl http_auth(kibanauser)
http-request auth realm basicauth unless auth_acl
{% for host in groups['kibana'] %} {% for host in groups['kibana'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kibana_server_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kibana_server_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% endfor %}

5
etc/kolla/passwords.yml
View File

@ -76,3 +76,8 @@ rabbitmq_cluster_cookie:
#################### ####################
haproxy_password: haproxy_password:
keepalived_password: keepalived_password:
####################
# Kibana options
####################
kibana_password: