You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/02/05 21:14:51 UTC
[14/20] git commit: refs/heads/4.1 - NiciraNvp Provider should not be
marked as external as this will prevent creation of networks when there is no
default CIDR in the zone.(cherry picked from commit
27e5d1fc040e91741663a2ec25dd7dc83031b140)
NiciraNvp Provider should not be marked as external as this will prevent
creation of networks when there is no default CIDR in the zone.(cherry picked from commit 27e5d1fc040e91741663a2ec25dd7dc83031b140)
Signed-off-by: Hugo Trippaers <tr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/862fc0d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/862fc0d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/862fc0d5
Branch: refs/heads/4.1
Commit: 862fc0d55b0cffbd57ed259b9aed092687ad3bb4
Parents: cb4d498
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Feb 4 15:51:45 2013 +0100
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Tue Feb 5 21:12:22 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/862fc0d5/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;