openstack/devstack
Code Issues Proposed changes

Merge "baremetal: Allow BM_SECOND_MAC to be unset"

Browse Source
This commit is contained in:
Jenkins
2013-10-18 04:54:37 +00:00
committed by Gerrit Code Review
parent a41bb3d1a6 af15d35414
commit 49c3780d28
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/baremetal
View File

@@ -449,8 +449,10 @@ function add_baremetal_node() {
"$mac_1" \ "$mac_1" \
| grep ' id ' | get_field 2 ) | grep ' id ' | get_field 2 )
[ $? -eq 0 ] || [ "$id" ] || die $LINENO "Error adding baremetal node" [ $? -eq 0 ] || [ "$id" ] || die $LINENO "Error adding baremetal node"
id2=$(nova baremetal-interface-add "$id" "$mac_2" ) if [ -n "$mac_2" ]; then
[ $? -eq 0 ] || [ "$id2" ] || die $LINENO "Error adding interface to barmetal node $id" id2=$(nova baremetal-interface-add "$id" "$mac_2" )
[ $? -eq 0 ] || [ "$id2" ] || die $LINENO "Error adding interface to barmetal node $id"
fi
} }