Commit 4434701a authored by Leigh Stoller's avatar Leigh Stoller

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 3bc1caa8 bf86d8b0
......@@ -145,9 +145,9 @@ void annotate_rspec::annotate_element (const char* v_name, list<const char*>* li
{
static int gave_apology;
if( !gave_apology ) {
if( !links->empty() && !gave_apology ) {
gave_apology = 1;
cout << "Warning: unable to locate interfaces on "
cerr << "Warning: unable to locate interfaces on "
"switch/switch links; omitting those\n";
}
}
......
......@@ -1670,9 +1670,11 @@ sub print_switch
{
push @$interfaces, "(null)";
}
# XXX
# XXX - local hack for Utah - don't allow our 'hub' switch to be host for
# LAN nodes, which encourages the placement of all LAN members on the same
# switch
my $types = ["switch:1"];
if ($name ne "procurve1") {
if (defined($MAINSITE) && $MAINSITE && $name ne "procurve1") {
push(@$types, "*lan:*");
}
print_node($name, $types, [], [], $uuid, $interfaces,
......
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