You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/06 20:11:02 UTC
[9/11] git commit: VPC: added dns1/dns2 + networkDomain to the list
of bootload args passed on VPC VR start
VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b4fec75f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b4fec75f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b4fec75f
Branch: refs/heads/vpc
Commit: b4fec75ff733d76a99b8faf6dcb2f5d5abb58f85
Parents: 540ea34
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jul 5 10:32:51 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 6 11:08:17 2012 -0700
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 1 -
.../VpcVirtualNetworkApplianceManagerImpl.java | 18 ++++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b4fec75f/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 347d7fb..c3b9f3c 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -52,7 +52,6 @@ import com.cloud.agent.api.GetDomRVersionCmd;
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
-import com.cloud.agent.api.RebootAnswer;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StopAnswer;
import com.cloud.agent.api.check.CheckSshAnswer;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b4fec75f/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 5738d5a..959831c 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -664,21 +664,33 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
ReservationContext context) {
if (profile.getVirtualMachine().getVpcId() != null) {
- //remove public and guest nics as we will plug them later
+ String defaultDns1 = null;
+ String defaultDns2 = null;
+ //remove public and guest nics as we will plug them later
Iterator<NicProfile> it = profile.getNics().iterator();
while (it.hasNext()) {
NicProfile nic = it.next();
if (nic.getTrafficType() == TrafficType.Public || nic.getTrafficType() == TrafficType.Guest) {
+ //save dns information
+ if(nic.getTrafficType() == TrafficType.Public) {
+ defaultDns1 = nic.getDns1();
+ defaultDns2 = nic.getDns2();
+ }
s_logger.debug("Removing nic of type " + nic.getTrafficType() + " from the nics passed on vm start. " +
"The nic will be plugged later");
it.remove();
}
}
- //add vpc cidr to the boot load args
+ //add vpc cidr/dns/networkdomain to the boot load args
StringBuilder buf = profile.getBootArgsBuilder();
Vpc vpc = _vpcMgr.getVpc(profile.getVirtualMachine().getVpcId());
- buf.append(" vpccidr=" + vpc.getCidr());
+ buf.append(" vpccidr=" + vpc.getCidr() + " domain=" + vpc.getNetworkDomain());
+
+ buf.append(" dns1=").append(defaultDns1);
+ if (defaultDns2 != null) {
+ buf.append(" dns2=").append(defaultDns2);
+ }
}
return super.finalizeVirtualMachineProfile(profile, dest, context);