You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/01/31 09:43:04 UTC
[7/12] git commit: refs/heads/network-refactor - IPv6: Disable
password and userdata service for ipv6 for now
IPv6: Disable password and userdata service for ipv6 for now
Would add support later.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d30d23ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d30d23ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d30d23ee
Branch: refs/heads/network-refactor
Commit: d30d23ee082f86766503073d75409ef5f5eb3075
Parents: 455d658
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jan 25 15:41:58 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jan 30 23:45:21 2013 -0800
----------------------------------------------------------------------
.../network/element/VirtualRouterElement.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d30d23ee/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 124d029..3301266 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -815,6 +815,11 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
if (vm.getType() != VirtualMachine.Type.User) {
return false;
}
+
+ if (network.getIp6Gateway() != null) {
+ s_logger.info("Skip password and userdata service setup for IPv6 VM");
+ return true;
+ }
@SuppressWarnings("unchecked")
VirtualMachineProfile<UserVm> uservm = (VirtualMachineProfile<UserVm>) vm;