x/daisycloud-core
Code Issues Proposed changes

Merge "solve interface name error when name length is 15"

Browse Source
This commit is contained in:
Jenkins 2017-01-16 11:45:46 +00:00 committed by Gerrit Code Review
commit fd98ec188c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/kolla/getnodeinfo.sh
View File

@ -81,7 +81,7 @@ function get_net_info(){
fi
for nic in $physical_networks
do
vlan_nic=`cat /proc/net/vlan/config | grep $nic |awk -F ' ' {'print $1'}`
vlan_nic=`cat /proc/net/vlan/config | grep $nic |awk -F '|' {'print $1'}`
if [ ! -z "$vlan_nic" ];then
all_vlan_nic+=" $vlan_nic "
fi
@ -115,7 +115,7 @@ function get_net_info(){
STATE="down"
fi
if [ -z "$BOND" ]; then
vlan_nic=`cat /proc/net/vlan/config |awk -F ' ' {'print $1'} |grep -w "${iface}$"`
vlan_nic=`cat /proc/net/vlan/config |awk -F '|' {'print $1'} | sed s/[[:space:]]//g |grep -w "${iface}$"`
if [ -z "$vlan_nic" ];then
TYPE="ether"
else