diff options
author | carey.xu <carey.xuhan@huawei.com> | 2015-12-25 22:07:37 +0800 |
---|---|---|
committer | carey xu <carey.xuhan@huawei.com> | 2015-12-26 03:25:13 +0000 |
commit | 8d9d65ef222225db6ffebe1f2ead334ef1f0280f (patch) | |
tree | f31f5f38a08aba6238897e57be0ed3e2326cd88b /deploy/network.sh | |
parent | a8624432701c9f1608a464c06f3b894d6fab76f9 (diff) |
use ovs network instead of macvtap for virtual deploy
JIRA: COMPASS-218
Change-Id: I3fdfa71e9f94be964c9bc5ec7313b6fbea9b46dd
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/network.sh')
-rwxr-xr-x | deploy/network.sh | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/deploy/network.sh b/deploy/network.sh index ac0a73e2..836af0f9 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -16,6 +16,44 @@ function setup_bridge_net() sudo virsh net-start $net_name } +function save_network_info() +{ + sudo ovs-vsctl list-br |grep br-external + br_exist=$? + external_nic=`ip route |grep '^default'|awk '{print $NF}'` + route_info=`ip route |grep -Eo '^default via [^ ]+'` + ip_info=`ip addr show $external_nic|grep -Eo '[^ ]+ brd [^ ]+ '` + if [ $br_exist -eq 0 ]; then + if [ "$external_nic" != "br-external" ]; then + sudo ovs-vsctl --may-exist add-port br-external $external_nic + sudo ip addr flush $external_nic + sudo ip addr add $ip_info dev br-external + sudo ip route add $route_info dev br-external + fi + else + sudo ovs-vsctl add-br br-external + sudo ovs-vsctl add-port br-external $external_nic + sudo ip addr flush $external_nic + sudo ip addr add $ip_info dev br-external + sudo ip route add $route_info dev br-external + fi +} + +function setup_bridge_external() +{ + sudo virsh net-destroy external + sudo virsh net-undefine external + + save_network_info + sed -e "s/REPLACE_NAME/external/g" \ + -e "s/REPLACE_OVS/br-external/g" \ + $COMPASS_DIR/deploy/template/network/bridge_ovs.xml \ + > $WORK_DIR/network/external.xml + + sudo virsh net-define $WORK_DIR/network/external.xml + sudo virsh net-start external +} + function setup_nat_net() { net_name=$1 gw=$2 @@ -50,5 +88,5 @@ function create_nets() { fi # create external network - setup_bridge_net external $EXTERNAL_NIC + setup_bridge_external } |