Commit 2fb7f5da authored by Mike Hibler's avatar Mike Hibler
Browse files

Fixes for adding nodes.

Pass -f option to newnodes so it ignores unconnected interfaces.
Make sure we enter the inner control net IP in new_nodes when !singlenet.
parent ad336ec2
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
# All rights reserved.
#
# TODO: ntpinfo table.
......@@ -1523,6 +1523,9 @@ sub UpdateEmulab()
if ($role eq TBDB_IFACEROLE_EXPERIMENT() &&
defined($ip) && $ip ne "") {
$role = TBDB_IFACEROLE_CONTROL();
# update the temp_new_nodes table with this IP
DBQueryFatal("update temp_new_nodes set IP='$ip' ".
" where node_id='$node'");
}
}
DBQueryFatal("insert into temp_new_interfaces set ".
......@@ -1565,7 +1568,7 @@ sub UpdateEmulab()
}
print "Telling inner boss ($bossnode) to incorporate new nodes: @nodes\n";
system("$SSH -host $bossnode sudo -u $creator /usr/testbed/sbin/wap ".
" /usr/testbed/sbin/newnode -q -n @nodes");
" /usr/testbed/sbin/newnode -f -q -n @nodes");
if ($?) {
print STDERR "*** $0:\n".
" Could not incorporate new nodes on inner boss\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment