All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 11671ab1 authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'mymaster'

parents 586d86ec 11b78302
......@@ -1039,6 +1039,7 @@ sub GetTicketAuxAux($)
my %lannodes = ();
my %allnodes = ();
my %bsnames = ();
my %prognames= ();
# Extra nodes (like XEN vhosts).
my %internal_nodemap = ();
# For stitching, keep track of external nodes and links.
......@@ -1823,10 +1824,24 @@ sub GetTicketAuxAux($)
$nodeblob->{"rootkey_private"} = -1; # means did not specify.
}
}
# Program agents.
#
# Program agents. We have to watch for duplicate names, the event
# system assumes each one is uniquely named.
#
if (my @progagents = GeniXML::GetProgramAgents($ref)) {
foreach my $agent (@progagents) {
my $vname = $agent->{"name"};
if (!defined($vname)) {
return GeniResponse->MalformedArgsResponse(
"No name for program agent");
}
if (exists($prognames{$vname})) {
return GeniResponse->MalformedArgsResponse(
"Emulab program agent names must be unique: $vname");
}
$prognames{$vname} = $vname;
$response = AddProgramAgent($virtexperiment,
$node_nickname, $agent);
goto bad
......
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