[cloudstack] branch 4.11 updated: CLOUDSTACK-9749: Fix Password server running on internal LB VM (#2409)

[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 a9fdb31  CLOUDSTACK-9749: Fix Password server running on internal LB VM (#2409)
a9fdb31 is described below

commit a9fdb31585a1e3250fd3a4d1627c697d6f624018
Author: Frank Maximus <th...@gmail.com>
AuthorDate: Fri Jan 19 09:11:57 2018 +0100

    CLOUDSTACK-9749: Fix Password server running on internal LB VM (#2409)
    
    Fixes code to start password server only on routers.
---
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
index 6ad5045..8b68f53 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
@@ -549,10 +549,21 @@ class CsIP:
         self.fw_router()
         self.fw_vpcrouter()
 
+        cmdline = self.config.cmdline()
+
         # On deletion nw_type will no longer be known
         if self.get_type() in ('guest'):
             if self.config.is_vpc() or self.config.is_router():
                 CsDevice(self.dev, self.config).configure_rp()
+
+                # If redundant then this is dealt with
+                # by the master backup functions
+                if not cmdline.is_redundant():
+                    if method == "add":
+                        CsPasswdSvc(self.address['public_ip']).start()
+                    elif method == "delete":
+                        CsPasswdSvc(self.address['public_ip']).stop()
+
                 logging.error(
                     "Not able to setup source-nat for a regular router yet")
 
@@ -564,11 +575,6 @@ class CsIP:
                 app = CsApache(self)
                 app.setup()
 
-        cmdline = self.config.cmdline()
-        # If redundant then this is dealt with by the master backup functions
-        if self.get_type() in ["guest"] and not cmdline.is_redundant():
-            pwdsvc = CsPasswdSvc(self.address['public_ip']).start()
-
         if self.get_type() == "public" and self.config.is_vpc() and method == "add":
             if self.address["source_nat"]:
                 vpccidr = cmdline.get_vpccidr()

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].