apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.11'

Browse Source
This commit is contained in:
Rohit Yadav 2018-01-19 13:46:58 +05:30
commit f7f14bfcc5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1544,7 +1544,7 @@ public class LibvirtVMDef {
public String toString() { public String toString() {
StringBuilder fsBuilder = new StringBuilder(); StringBuilder fsBuilder = new StringBuilder();
for (Map.Entry<String, String> address : addresses.entrySet()) { 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(" <interface mac='")
.append(address.getKey()) .append(address.getKey())
.append("' vsp-vr-ip='") .append("' vsp-vr-ip='")

16
systemvm/debian/opt/cloud/bin/cs/CsAddress.py
View File

@ -549,10 +549,21 @@ class CsIP:
self.fw_router() self.fw_router()
self.fw_vpcrouter() self.fw_vpcrouter()
cmdline = self.config.cmdline()
# On deletion nw_type will no longer be known # On deletion nw_type will no longer be known
if self.get_type() in ('guest'): if self.get_type() in ('guest'):
if self.config.is_vpc() or self.config.is_router(): if self.config.is_vpc() or self.config.is_router():
CsDevice(self.dev, self.config).configure_rp() 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( logging.error(
"Not able to setup source-nat for a regular router yet") "Not able to setup source-nat for a regular router yet")
@ -564,11 +575,6 @@ class CsIP:
app = CsApache(self) app = CsApache(self)
app.setup() 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.get_type() == "public" and self.config.is_vpc() and method == "add":
if self.address["source_nat"]: if self.address["source_nat"]:
vpccidr = cmdline.get_vpccidr() vpccidr = cmdline.get_vpccidr()