aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-04 18:15:04 +0000
committerGerrit Code Review <review@openstack.org>2016-03-04 18:15:04 +0000
commit6daf6eb0cd857058c36baf156096af26b3b33c2c (patch)
treeea29712894bed2814e9f3fc65614144645a94300
parentd289e9f6f2cb666aec6b70d6c4417487f5eeabd4 (diff)
parente6b230d78436dfb7b38b1c30c4a9325909ae1d20 (diff)
downloadkolla-6daf6eb0cd857058c36baf156096af26b3b33c2c.tar.gz
kolla-6daf6eb0cd857058c36baf156096af26b3b33c2c.zip
Merge "Add authentication for keepalived"
-rw-r--r--ansible/roles/haproxy/templates/keepalived.conf.j28
-rw-r--r--etc/kolla/passwords.yml1
2 files changed, 9 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/templates/keepalived.conf.j2 b/ansible/roles/haproxy/templates/keepalived.conf.j2
index dee8a6e5e..d599ea721 100644
--- a/ansible/roles/haproxy/templates/keepalived.conf.j2
+++ b/ansible/roles/haproxy/templates/keepalived.conf.j2
@@ -14,6 +14,10 @@ vrrp_instance kolla_internal_vip {
virtual_ipaddress {
{{ kolla_internal_vip_address }}
}
+ authentication {
+ auth_type PASS
+ auth_pass {{ keepalived_password }}
+ }
track_script {
check_alive
}
@@ -29,6 +33,10 @@ vrrp_instance kolla_external_vip {
virtual_ipaddress {
{{ kolla_external_vip_address }}
}
+ authentication {
+ auth_type PASS
+ auth_pass {{ keepalived_password }}
+ }
track_script {
check_alive
}
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index b0c2d9965..deed018da 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -86,3 +86,4 @@ rabbitmq_cluster_cookie: "password"
# HAProxy options
####################
haproxy_password: "password"
+keepalived_password: "password"