Have rVPCs use the router.redundant.vrrp.interval setting It defaults to 1, which is hardcoded in the template: ./cosmic/cosmic-core/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ
As non-VPC redundant routers use this setting, I think it makes sense to use it for rVPCs as well. We also need a change to pickup the cmd_line parameter and use it in the Python code that configures the router. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2bfb12cb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2bfb12cb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2bfb12cb Branch: refs/heads/4.8 Commit: 2bfb12cba994ecf37478a283c873043f2475818e Parents: bbb2dd0 Author: Remi Bergsma <[email protected]> Authored: Wed Mar 23 16:33:20 2016 +0100 Committer: Remi Bergsma <[email protected]> Committed: Fri May 13 14:36:23 2016 +0200 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bfb12cb/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index ac8b868..f7947d5 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1598,6 +1598,9 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM if (isRedundant) { buf.append(" redundant_router=1"); + final int advertInt = NumbersUtil.parseInt(_configDao.getValue(Config.RedundantRouterVrrpInterval.key()), 1); + buf.append(" advert_int=").append(advertInt); + final Long vpcId = router.getVpcId(); final List<DomainRouterVO> routers; if (vpcId != null) {
