Merge branch '4.11'

Author: yadvr

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -1544,7 +1544,7 @@ public void addNuageExtension(String macAddress, String vrIp) {
         public String toString() {
             StringBuilder fsBuilder = new StringBuilder();
             for (Map.Entry<String, String> address : addresses.entrySet()) {
-                fsBuilder.append("<nuage-extension>\n")
+                fsBuilder.append("<nuage-extension xmlns='nuagenetworks.net/nuage/cna'>\n")
                         .append("  <interface mac='")
                         .append(address.getKey())
                         .append("' vsp-vr-ip='")

systemvm/debian/opt/cloud/bin/cs/CsAddress.py

@@ -549,10 +549,21 @@ def post_config_change(self, method):
         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 @@ def post_config_change(self, method):
                 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()