Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
b508a2cb
Commit
b508a2cb
authored
May 04, 2011
by
Weibin Sun
Browse files
Merge branch 'master' into portmerge
parents
5d2ca341
25ddf8e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
tbsetup/elabinelab.in
View file @
b508a2cb
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-201
0
University of Utah and the Flux Group.
# Copyright (c) 2004-201
1
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
";
...
...
tmcd/common/libsetup.pm
View file @
b508a2cb
...
...
@@ -1287,7 +1287,8 @@ sub getifconfig($;$)
# don't have to force virtual devices onto physical nodes just because
# 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
# interface and locate the entry for each phys interface.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment