commit 49c3780d28fbe76e5563efa28cbda936378ebfda
author Jenkins <jenkins@review.openstack.org> Fri Oct 18 04:54:37 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Oct 18 04:54:37 2013 +0000
tree 66965cbacf1604ed1f17afd17dbd9d6e7661d6cb
parent a41bb3d1a6a0e40ffdaad416157a021ef201d73d
parent af15d35414abea1e0dd9792d3fffcffab47afc1c

Merge "baremetal: Allow BM_SECOND_MAC to be unset"

lib/baremetal

diff --git a/lib/baremetal b/lib/baremetal
index 52af420..f4d8589 100644
--- a/lib/baremetal
+++ b/lib/baremetal
@@ -449,8 +449,10 @@
        "$mac_1" \
        | grep ' id ' | get_field 2 )
     [ $? -eq 0 ] || [ "$id" ] || die $LINENO "Error adding baremetal node"
-    id2=$(nova baremetal-interface-add "$id" "$mac_2" )
-    [ $? -eq 0 ] || [ "$id2" ] || die $LINENO "Error adding interface to barmetal node $id"
+    if [ -n "$mac_2" ]; then
+        id2=$(nova baremetal-interface-add "$id" "$mac_2" )
+        [ $? -eq 0 ] || [ "$id2" ] || die $LINENO "Error adding interface to barmetal node $id"
+    fi
 }