[cloudstack] branch 4.11 updated: router: Fixes #2544 run passwd server on dhcpserver IP on rVR (#2635)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new ece79e6  router: Fixes #2544 run passwd server on dhcpserver IP on rVR (#2635)
ece79e6 is described below

commit ece79e691329e9ad84455a2eeb89739f09628b19
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Mon May 14 16:21:57 2018 +0530

    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 <ro...@shapeblue.com>
---
 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 7fc2020..3ade4a2 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")

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.