Repository: cloudstack
Updated Branches:
refs/heads/master 07365c3da -> 2b5120751
fix scripts that handle setting up bridge for tunnel network and for
distributed routing. Fix ensures there is approproate flag in other
config of the network to indicate the bridge type.
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c838f3ab
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c838f3ab
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c838f3ab
Branch: refs/heads/master
Commit: c838f3abb83b0f46c14e2c518794050e593cf738
Parents: 07365c3
Author: Murali Reddy <[email protected]>
Authored: Thu Mar 20 11:33:37 2014 +0530
Committer: Murali Reddy <[email protected]>
Committed: Thu Mar 20 16:30:07 2014 +0530
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/ovstunnel | 4 ++++
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c838f3ab/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel
b/scripts/vm/hypervisor/xenserver/ovstunnel
index 98a9d0b..fec0072 100755
--- a/scripts/vm/hypervisor/xenserver/ovstunnel
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -103,6 +103,8 @@ def setup_ovs_bridge(session, args):
"bridge=%s" % bridge, "--minimal"])
lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
"other-config:is-ovs-tun-network=True"])
+ lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
+ "other-config:is-ovs_vpc_distributed_vr_network=False"])
conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get",
"uuid=%s" % xs_nw_uuid,
"param-name=other-config",
@@ -156,6 +158,8 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
"bridge=%s" % bridge, "--minimal"])
lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
+ "other-config:is-ovs-tun-network=False"])
+ lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
"other-config:is-ovs_vpc_distributed_vr_network=True"])
conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get",
"uuid=%s" % xs_nw_uuid,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c838f3ab/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 4cd125e..86adb8f 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -381,6 +381,7 @@ public class VpcManagerImpl extends ManagerBase implements
VpcManager, VpcProvis
}
validateConnectivtyServiceCapablitlies(svcProviderMap.get(Service.Connectivity),
serviceCapabilitystList);
+
boolean supportsDistributedRouter =
isVpcOfferingSupportsDistributedRouter(serviceCapabilitystList);
VpcOffering offering = createVpcOffering(name, displayText,
svcProviderMap, false, null,
