From ece79e691329e9ad84455a2eeb89739f09628b19 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 14 May 2018 16:21:57 +0530 Subject: [PATCH] router: Fixes #2544 run passwd server on dhcpserver IP on rVR (#2635) This ensures that password server runs on the dhcpserver identifier IP which is the not the VRRP virtual (10.1.1.1) IP by default but the actual ip of the interface. When dhcp client discovery is made, the `dhcp-server-identifier` contains the non VIP address that is used by password reset script to query guest VM password. Signed-off-by: Rohit Yadav --- systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py index 7fc2020b6f7..3ade4a2a979 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py @@ -245,6 +245,7 @@ class CsRedundant(object): interfaces = [interface for interface in self.address.get_interfaces() if interface.needs_vrrp()] for interface in interfaces: + CsPasswdSvc(interface.get_ip()).stop() CsPasswdSvc(interface.get_gateway()).stop() self.cl.set_fault_state() @@ -281,7 +282,9 @@ class CsRedundant(object): interfaces = [interface for interface in self.address.get_interfaces() if interface.needs_vrrp()] for interface in interfaces: + CsPasswdSvc(interface.get_ip()).stop() CsPasswdSvc(interface.get_gateway()).stop() + CsHelper.service("dnsmasq", "stop") self.cl.set_master_state(False) @@ -335,8 +338,10 @@ class CsRedundant(object): CsHelper.execute("%s -B" % cmd) CsHelper.service("ipsec", "restart") CsHelper.service("xl2tpd", "restart") + interfaces = [interface for interface in self.address.get_interfaces() if interface.needs_vrrp()] for interface in interfaces: + CsPasswdSvc(interface.get_ip()).restart() CsPasswdSvc(interface.get_gateway()).restart() CsHelper.service("dnsmasq", "restart")