From 1ee0c309354a6207957e70a12f23fd7b232f3ad7 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 29 Jun 2012 13:59:49 -0700 Subject: [PATCH] VPC: added vpccidr to the list of VPC router bootload args --- .../router/VpcVirtualNetworkApplianceManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index c9ccc410745..af09905c7ed 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -675,8 +675,13 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian it.remove(); } } + + //add vpc cidr to the boot load args + StringBuilder buf = profile.getBootArgsBuilder(); + Vpc vpc = _vpcMgr.getVpc(profile.getVirtualMachine().getVpcId()); + buf.append(" vpccidr=" + vpc.getCidr()); } - + return super.finalizeVirtualMachineProfile(profile, dest, context); }