Commit 8741f48a authored by Leigh B Stoller's avatar Leigh B Stoller

Return tipserver info the VMs, even though we don't have one yet. The

tipline will not exist until the VM is running (since the capture runs on
the physhost), but that that is too late for inclusion in the manifest.
Need a better mechanism.
parent f869d8b7
#!/usr/bin/perl -wT
#
# Copyright (c) 2008-2014 University of Utah and the Flux Group.
# Copyright (c) 2008-2015 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
......@@ -862,7 +862,15 @@ sub AnnotateManifest($)
}
}
my $tipserver = undef;
if ($node->TipServer(\$tipserver) == 0 && defined($tipserver)) {
#
# The tipline for a virtual node will not exist till its booted,
# since the capture runs on the physical host. But thats too late,
# it needs to be in the manifest now. So lets just say we have
# one, expecting it to be available by the time the user might
# want to use it.
#
if (($node->TipServer(\$tipserver) == 0 && defined($tipserver)) ||
$node->isvirtnode()) {
if (! defined($services)) {
$services = GeniXML::AddElement("services", $rspec);
}
......@@ -872,7 +880,8 @@ sub AnnotateManifest($)
$services->removeChild($console);
}
$console = GeniXML::AddElement("console",$services,$GeniXML::EMULAB_NS);
GeniXML::SetText("server", $console, $tipserver);
GeniXML::SetText("server", $console,
(defined($tipserver) ? $tipserver : $sshdhost));
}
if ($self->UpdateRspec($rspec)) {
......
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