Commit b508a2cb authored by Weibin Sun's avatar Weibin Sun
Browse files

Merge branch 'master' into portmerge

parents 5d2ca341 25ddf8e8
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# EMULAB-COPYRIGHT # 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. # All rights reserved.
# #
# TODO: ntpinfo table. # TODO: ntpinfo table.
...@@ -1523,6 +1523,9 @@ sub UpdateEmulab() ...@@ -1523,6 +1523,9 @@ sub UpdateEmulab()
if ($role eq TBDB_IFACEROLE_EXPERIMENT() && if ($role eq TBDB_IFACEROLE_EXPERIMENT() &&
defined($ip) && $ip ne "") { defined($ip) && $ip ne "") {
$role = TBDB_IFACEROLE_CONTROL(); $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 ". DBQueryFatal("insert into temp_new_interfaces set ".
...@@ -1565,7 +1568,7 @@ sub UpdateEmulab() ...@@ -1565,7 +1568,7 @@ sub UpdateEmulab()
} }
print "Telling inner boss ($bossnode) to incorporate new nodes: @nodes\n"; print "Telling inner boss ($bossnode) to incorporate new nodes: @nodes\n";
system("$SSH -host $bossnode sudo -u $creator /usr/testbed/sbin/wap ". 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 ($?) { if ($?) {
print STDERR "*** $0:\n". print STDERR "*** $0:\n".
" Could not incorporate new nodes on inner boss\n"; " Could not incorporate new nodes on inner boss\n";
......
...@@ -1287,7 +1287,8 @@ sub getifconfig($;$) ...@@ -1287,7 +1287,8 @@ sub getifconfig($;$)
# don't have to force virtual devices onto physical nodes just because # don't have to force virtual devices onto physical nodes just because
# some virtual nodes in the same experiment require multiplexed links. # some virtual nodes in the same experiment require multiplexed links.
# #
if ($hasvirt && !JAILED() && !GENVNODE() && !REMOTE() && !PLAB()) { if ($hasvirt && !JAILED() && !JAILHOST() && !GENVNODE() &&
!REMOTE() && !PLAB()) {
# #
# Prelim: find out how many virt interfaces mapped to each phys # Prelim: find out how many virt interfaces mapped to each phys
# interface and locate the entry for each phys interface. # interface and locate the entry for each phys interface.
......
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