incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [2/50] [abbrv] git commit: refs/heads/storage_refactor - NiciraNvp Provider should not be marked as external as this will prevent creation of networks when there is no default CIDR in the zone.
Date Wed, 06 Feb 2013 02:43:29 GMT
NiciraNvp Provider should not be marked as external as this will prevent
creation of networks when there is no default CIDR in the zone.

Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/27e5d1fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/27e5d1fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/27e5d1fc

Branch: refs/heads/storage_refactor
Commit: 27e5d1fc040e91741663a2ec25dd7dc83031b140
Parents: 43dc31b
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Mon Feb 4 15:51:45 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Mon Feb 4 15:51:45 2013 +0100

----------------------------------------------------------------------
 api/src/com/cloud/network/Network.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/27e5d1fc/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index 889b9af..2bf7b7f 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -135,7 +135,8 @@ public interface Network extends ControlledEntity, StateObject<Network.State>,
I
         public static final Provider SecurityGroupProvider = new Provider("SecurityGroupProvider",
false);
         public static final Provider VPCVirtualRouter = new Provider("VpcVirtualRouter",
false);
         public static final Provider None = new Provider("None", false);
-        public static final Provider NiciraNvp = new Provider("NiciraNvp", true);
+        // NiciraNvp is not an "External" provider, otherwise we get in trouble with NetworkServiceImpl.providersConfiguredForExternalNetworking

+        public static final Provider NiciraNvp = new Provider("NiciraNvp", false);  
         public static final Provider MidokuraMidonet = new Provider("MidokuraMidonet", true);
 
         private String name;


Mime
View raw message