You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/07/17 06:38:47 UTC
git commit: updated refs/heads/4.2 to 664d479
Updated Branches:
refs/heads/4.2 ba4c4400b -> 664d479f8
Cloudstack-3313 Cannot deploy vm in ipv6 network
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/664d479f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/664d479f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/664d479f
Branch: refs/heads/4.2
Commit: 664d479f8fe46d3c2f177b75372f45a041df456e
Parents: ba4c440
Author: Bharat Kumar <bh...@citrix.com>
Authored: Tue Jul 16 11:40:01 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Wed Jul 17 10:07:57 2013 +0530
----------------------------------------------------------------------
.../systemvm/debian/config/etc/init.d/cloud-early-config | 9 ++++++++-
.../com/cloud/configuration/ConfigurationManagerImpl.java | 3 ++-
server/src/com/cloud/network/NetworkManagerImpl.java | 6 ++++--
3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/664d479f/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index f93c39d..5835c4d 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -544,7 +544,14 @@ setup_dnsmasq() {
[ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
[ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >> /etc/dnsmasq.conf
#adding the name data-server to the /etc/hosts for allowing the access to user-data service and ssh-key reset in every subnet.
- echo "$ETH0_IP data-server" >> /etc/hosts
+ if [ -n "$ETH0_IP" ]
+ then
+ echo "$ETH0_IP data-server" >> /etc/hosts
+ fi
+ if [ -n "$ETH0_IP6" ]
+ then
+ echo "$ETH0_IP6 data-server" >> /etc/hosts
+ fi
}
setup_sshd(){
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/664d479f/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 7e0bc25..b746a36 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2831,6 +2831,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
ip6Gateway = network.getIp6Gateway();
ip6Cidr = network.getIp6Cidr();
_networkModel.checkIp6Parameters(startIPv6, endIPv6, ip6Gateway, ip6Cidr);
+ sameSubnet = true;
}
}
}
@@ -2846,7 +2847,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
vlanDetails = new Pair<String, String>(newVlanGateway, newVlanNetmask);
}
// check if the gatewayip is the part of the ip range being added.
- if (NetUtils.ipRangesOverlap(startIP, endIP, vlanDetails.first(), vlanDetails.first())) {
+ if (ipv4 && NetUtils.ipRangesOverlap(startIP, endIP, vlanDetails.first(), vlanDetails.first())) {
throw new InvalidParameterValueException(
"The gateway ip should not be the part of the ip range being added.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/664d479f/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 45ff2bd..ba39caf 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2003,8 +2003,10 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp, element.getProvider()) &&
element instanceof DhcpServiceProvider) {
DhcpServiceProvider sp = (DhcpServiceProvider) element;
- if (!sp.configDhcpSupportForSubnet(network, profile, vmProfile, dest, context)) {
- return false;
+ if (profile.getIp6Address() == null) {
+ if (!sp.configDhcpSupportForSubnet(network, profile, vmProfile, dest, context)) {
+ return false;
+ }
}
sp.addDhcpEntry(network, profile, vmProfile, dest, context);
}