[GitHub] rhtyd closed pull request #2635: router: Fixes #2544 run passwd server on dhcpserver IP on rVR

[GitBox <gi...@apache.org>]

rhtyd closed pull request #2635: router: Fixes #2544 run passwd server on dhcpserver IP on rVR
URL: https://github.com/apache/cloudstack/pull/2635
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 @@ def set_fault(self):
 
         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 @@ def set_backup(self):
 
         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 @@ def set_master(self):
         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")


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services