From 80c770bb093ad2af54171de1a2c4630536d4daf0 Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Fri, 9 Oct 2015 18:32:31 +0800
Subject: bugfix: libvirt_type should be kvm when host is barebetal mode

JIRA: COMPASS-81

Change-Id: Iba3cb182a3e461ab89eb40fdba7800b8b2a1fc3e
Signed-off-by: baigk <baiguoku@huawei.com>
---
 deploy/network.sh | 53 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 12 deletions(-)

(limited to 'deploy/network.sh')

diff --git a/deploy/network.sh b/deploy/network.sh
index a5344f58..e5133c9e 100755
--- a/deploy/network.sh
+++ b/deploy/network.sh
@@ -8,15 +8,20 @@ function destroy_bridge()
 {
     bridge=$1
     nic=$2
-    install_gw="$3"
+    ip="$3"
 
     brige_info=$(ip addr show $bridge 2>/dev/null)
     if [[ -z $brige_info ]]; then
         return
     fi
-    ips=`echo "$brige_info" | grep 'inet ' | grep -v $install_gw | sed  "s/inet //g"`
 
-    routes=$(ip route show | grep $bridge | grep -v $install_gw)
+    if [[ -n $ip ]]; then
+        ip addr delete $ip dev $bridge | true
+    fi
+
+    ips=`echo "$brige_info" | grep 'inet ' | sed  "s/inet //g"`
+
+    routes=$(ip route show | grep $bridge)
 
     ip link set $bridge down
 
@@ -77,9 +82,6 @@ function create_bridge()
         done
     fi
 
-    mask_len=`get_mask_len $INSTALL_MASK`
-    broadcast=`get_broadcast_addr $INSTALL_GW $INSTALL_MASK`
-    ip addr add $INSTALL_GW/$mask_len brd $broadcast dev $bridge
 
     if [[ -n $routes ]]; then
         echo "$routes" | while read line; do
@@ -88,12 +90,36 @@ function create_bridge()
     fi
 }
 
-function setup_om_bridge() {
-    destroy_bridge br_install $OM_NIC $INSTALL_GW
-    create_bridge br_install $OM_NIC
+function add_install_ip() {
+    mask_len=`get_mask_len $INSTALL_MASK`
+    broadcast=`get_broadcast_addr $INSTALL_GW $INSTALL_MASK`
+    ip addr add $INSTALL_GW/$mask_len brd $broadcast dev $bridge
+}
+
+function setup_install_bridge() {
+    destroy_bridge br_install $INSTALL_NIC $INSTALL_GW
+    create_bridge br_install $INSTALL_NIC
+    add_install_ip
 }
 
-function setup_om_nat() {
+function setup_external_net() {
+    if [[ -z `brctl show br_external 2>/dev/null` ]]; then
+        brctl addbr br_external
+    fi
+
+    if [[ -z $EXTERNAL_NIC ]]; then
+        return
+    fi
+
+    if [[ $TYPE == baremetal && $EXTERNAL_NIC == $INSTALL_NIC ]]; then
+        exit 1
+    fi
+
+    destroy_bridge br_external $EXTERNAL_NIC ""
+    create_bridge br_external $EXTERNAL_NIC
+}
+
+function setup_install_nat() {
     destroy_nat install
     # create install network
     sed -e "s/REPLACE_BRIDGE/br_install/g" \
@@ -126,9 +152,12 @@ function create_nets() {
 
     # create install network
     if [[ ! -z $VIRT_NUMBER ]];then
-        setup_om_nat
+        setup_install_nat
     else
-        setup_om_bridge
+        setup_install_bridge
     fi
+
+    # create external network
+    setup_external_net
 }
 
-- 
cgit 1.2.3-korg