diff options
| author | akwasniewska <alicja.kwasniewska@intel.com> | 2016-03-23 12:02:49 +0100 |
|---|---|---|
| committer | akwasniewska <alicja.kwasniewska@intel.com> | 2016-03-24 11:46:06 +0100 |
| commit | ba62740a9375e52af074ca75c56ef1bafdd735af (patch) | |
| tree | c0bd0aef3749d2b343bd08b9cf46b29c2b76c30b | |
| parent | 721229297eae59862c44496e3eb359ea805d5541 (diff) | |
| download | kolla-ba62740a9375e52af074ca75c56ef1bafdd735af.tar.gz kolla-ba62740a9375e52af074ca75c56ef1bafdd735af.zip | |
Add kibana authentication using HAproxy
Change-Id: Ib501571dd34cb68924775ce738499d63df5718dd
Closes-Bug: 1556487
| -rw-r--r-- | ansible/group_vars/all.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 6 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index bfa4c2051..a0ab95a8a 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -210,6 +210,13 @@ haproxy_enable_external_vip: "{{ 'no' if kolla_external_vip_address == kolla_int kolla_enable_tls_external: "no" kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem" + +#################### +# Kibana options +#################### +kibana_user: "kibana" + + ################################# # Cinder - Block Storage options ################################# diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 542d86247..aa808ee53 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -374,8 +374,14 @@ listen radosgw_external {% endif %} {% if enable_central_logging | bool %} + +userlist kibanauser + user {{ kibana_user }} insecure-password {{ kibana_password }} + listen kibana 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'] %} 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 %} diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index a79211739..12b2d6bf5 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -76,3 +76,8 @@ rabbitmq_cluster_cookie: #################### haproxy_password: keepalived_password: + +#################### +# Kibana options +#################### +kibana_password: |