aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiu Yu <qiuyu@ebaysf.com>2015-09-16 18:39:51 -0700
committerQiu Yu <qiuyu@ebaysf.com>2015-09-17 09:55:27 +0800
commitc7ceca711a4beb80f890aa743dfa5cf425796dc3 (patch)
tree47a02c51cfe6b652594b9dbc02d22637609c96b0
parent3d486550fa385a072b28f8c3442d336d6b735356 (diff)
downloadkolla-c7ceca711a4beb80f890aa743dfa5cf425796dc3.tar.gz
kolla-c7ceca711a4beb80f890aa743dfa5cf425796dc3.zip
Expose HAProxy stats for management purpose
Change-Id: Ia7263a9993e29c8f3db71e86264b786398224223 Closes-Bug: #1496658
-rw-r--r--ansible/group_vars/all.yml8
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j28
-rw-r--r--etc/kolla/passwords.yml6
3 files changed, 22 insertions, 0 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 9ced61ee9..5e1ba517d 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -78,6 +78,8 @@ rabbitmq_management_port: "15672"
rabbitmq_cluster_port: "25672"
rabbitmq_epmd_port: "4369"
+haproxy_stats_port: "1984"
+
keystone_public_port: "5000"
keystone_admin_port: "35357"
@@ -153,6 +155,12 @@ enable_murano: "no"
rabbitmq_user: "openstack"
+####################
+# HAProxy options
+####################
+haproxy_user: "openstack"
+
+
#################################
# Cinder - Block Storage options
#################################
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 745d9b0f5..71a7f45aa 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -14,6 +14,14 @@ defaults
timeout server 1m
timeout check 10s
+listen stats :{{ haproxy_stats_port }}
+ mode http
+ stats enable
+ stats uri /
+ stats refresh 15s
+ stats realm Haproxy\ Stats
+ stats auth {{ haproxy_user }}:{{ haproxy_password }}
+
listen mariadb
mode tcp
option tcpka
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 4785c6b56..3d7ec924f 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -51,3 +51,9 @@ murano_keystone_password: "password"
####################
rabbitmq_password: "password"
rabbitmq_cluster_cookie: "password"
+
+
+####################
+# HAProxy options
+####################
+haproxy_password: "password"