diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-03-15 19:54:37 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-05-17 00:27:08 +0000 |
| commit | d5dc62c40bfd2bc3a0cf5603930379d45d236f51 (patch) | |
| tree | 730fc447461a9e08bde38eaa4df0edb80652863a | |
| parent | 65dc7dd387744967153a45cb8fe3040a6572727e (diff) | |
vrrpd: tweak startup criteria for v6 VRRP router
* Remove check for having at least 2 IPv6 addresses on the macvlan
device; this was only taking place in v6, and breaking the ability to
start VRRP on an IPv6 macvlan that was already set to protodown on
* Improve log messaging indicating that we cannot start because we
haven't got any VIPs configured
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
| -rw-r--r-- | vrrpd/vrrp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index 8f54bcf7c3..f2271278cc 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -323,12 +323,13 @@ void vrrp_check_start(struct vrrp_vrouter *vr) /* Macvlan interface must have a link local */ start = start && connected_get_linklocal(r->mvl_ifp); whynot = (!start && !whynot) ? "No link local address configured" : NULL; -#endif /* Macvlan interface must have a v6 IP besides the link local */ start = start && (r->mvl_ifp->connected->count >= 2); - whynot = (!start && !whynot) ? "No Virtual IP address configured" : NULL; + whynot = (!start && !whynot) ? "No Virtual IP configured on macvlan device" : NULL; +#endif /* Must have at least one VIP configured */ start = start && r->addrs->count > 0; + whynot = (!start && !whynot) ? "No Virtual IP address configured" : NULL; if (start) vrrp_event(r, VRRP_EVENT_STARTUP); else if (whynot) |