CLOUDSTACK-6162:support OVS as connectivity service provider adds 'Ovs' as network service provider in the physical network (cherry picked from commit b8c4ed435abc26950e36e21f9d482639b6691206)
Signed-off-by: Animesh Chaturvedi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a8a36de4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8a36de4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8a36de4 Branch: refs/heads/4.3 Commit: a8a36de4c8b543971ea97a24195a55101f472ed3 Parents: 2d35096 Author: Murali Reddy <[email protected]> Authored: Thu Feb 27 17:27:07 2014 +0530 Committer: Animesh Chaturvedi <[email protected]> Committed: Tue Mar 4 23:41:52 2014 -0800 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8a36de4/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 270ff7b..c3bf72a 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -2503,9 +2503,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { addDefaultInternalLbProviderToPhysicalNetwork(pNetwork.getId()); // Add OVS provider as default network service provider - if (pNetwork.getIsolationMethods().contains("GRE")) { - addDefaultOvsToPhysicalNetwork(pNetwork.getId()); - } + addDefaultOvsToPhysicalNetwork(pNetwork.getId()); + return pNetwork; }
