openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make keepalived virtual_router_id param configurable"

Browse Source
This commit is contained in:
Jenkins 2016-04-01 21:38:19 +00:00 committed by Gerrit Code Review
commit 73800ef8ed
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/group_vars/all.yml
View File

@ -67,6 +67,13 @@ docker_common_options:
restart_retries: "{{ docker_restart_policy_retry }}" restart_retries: "{{ docker_restart_policy_retry }}"
####################
# keepalived options
####################
# Arbitary unique number from 0..255
keepalived_virtual_router_id: "51"
#################### ####################
# Networking options # Networking options
#################### ####################

4
ansible/roles/haproxy/templates/keepalived.conf.j2
View File

@ -5,11 +5,11 @@ vrrp_script check_alive {
rise 10 rise 10
} }
vrrp_instance kolla_internal_vip { vrrp_instance kolla_internal_vip_{{ keepalived_virtual_router_id }} {
state BACKUP state BACKUP
nopreempt nopreempt
interface {{ api_interface }} interface {{ api_interface }}
virtual_router_id 51 virtual_router_id {{ keepalived_virtual_router_id }}
priority {{ groups['haproxy'].index(inventory_hostname) + 1 }} priority {{ groups['haproxy'].index(inventory_hostname) + 1 }}
advert_int 1 advert_int 1
virtual_ipaddress { virtual_ipaddress {

7
etc/kolla/globals.yml
View File

@ -74,6 +74,13 @@ neutron_external_interface: "eth1"
#neutron_plugin_agent: "openvswitch" #neutron_plugin_agent: "openvswitch"
####################
# keepalived options
####################
# Arbitary unique number from 0..255
#keepalived_virtual_router_id: "51"
#################### ####################
# TLS options # TLS options
#################### ####################