diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-01 21:38:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-01 21:38:19 +0000 |
| commit | 73800ef8ed9b4ef655ecd2fb945c29dae85582a9 (patch) | |
| tree | 9f835f61038079b575c7e208f82c3e770954c44f | |
| parent | 7a27826c78ba0e7427dba80b19cff3aa890cf3cb (diff) | |
| parent | 676998a1241f68b77d15b09d7113ae2182130c68 (diff) | |
| download | kolla-73800ef8ed9b4ef655ecd2fb945c29dae85582a9.tar.gz kolla-73800ef8ed9b4ef655ecd2fb945c29dae85582a9.zip | |
Merge "Make keepalived virtual_router_id param configurable"
| -rw-r--r-- | ansible/group_vars/all.yml | 7 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/keepalived.conf.j2 | 4 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 7 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index a0ab95a8a..da2205648 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -68,6 +68,13 @@ docker_common_options: #################### +# keepalived options +#################### +# Arbitary unique number from 0..255 +keepalived_virtual_router_id: "51" + + +#################### # Networking options #################### kolla_external_vip_interface: "{{ network_interface }}" diff --git a/ansible/roles/haproxy/templates/keepalived.conf.j2 b/ansible/roles/haproxy/templates/keepalived.conf.j2 index b6abb82e2..8307a2f50 100644 --- a/ansible/roles/haproxy/templates/keepalived.conf.j2 +++ b/ansible/roles/haproxy/templates/keepalived.conf.j2 @@ -5,11 +5,11 @@ vrrp_script check_alive { rise 10 } -vrrp_instance kolla_internal_vip { +vrrp_instance kolla_internal_vip_{{ keepalived_virtual_router_id }} { state BACKUP nopreempt interface {{ api_interface }} - virtual_router_id 51 + virtual_router_id {{ keepalived_virtual_router_id }} priority {{ groups['haproxy'].index(inventory_hostname) + 1 }} advert_int 1 virtual_ipaddress { diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 6ef24ffa4..0ca120a47 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -75,6 +75,13 @@ neutron_external_interface: "eth1" #################### +# keepalived options +#################### +# Arbitary unique number from 0..255 +#keepalived_virtual_router_id: "51" + + +#################### # TLS options #################### # To provide encryption and authentication on the kolla_external_vip_interface, |