incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [7/48] git commit: refs/heads/regions - IPv6: Disable password and userdata service for ipv6 for now
Date Fri, 01 Feb 2013 06:11:34 GMT
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/74811fa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/74811fa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/74811fa8

Branch: refs/heads/regions
Commit: 74811fa8b4f2f422a74c291ad2f3a63df52ee992
Parents: 8f66d26
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Jan 25 15:41:58 2013 -0800
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Sat Jan 26 23:14:48 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/74811fa8/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 2b54ae0..49e726a 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -821,6 +821,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;


Mime
View raw message