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 c4fe601c authored by Leigh B Stoller's avatar Leigh B Stoller

Do not use default image for a bridge node, let the mapper set it.

parent fc02c625
......@@ -1460,7 +1460,8 @@ sub GetTicketAuxAux($$$$$$$$$$$)
#
# If no osname, check for protogeni default osname
#
if (! defined($osname) && !GeniXML::UseTypeDefaultImage($ref)) {
if (!defined($osname) &&
!GeniXML::UseTypeDefaultImage($ref) && !$isbridge) {
my $protogeni_os = undef;
if (GetSiteVar('protogeni/default_osname', \$protogeni_os)
&& $protogeni_os ne ""
......@@ -1472,7 +1473,7 @@ sub GetTicketAuxAux($$$$$$$$$$$)
#
# If no osname by this point, try for the default.
#
if (defined($node) && !defined($osname)) {
if (defined($node) && !defined($osname) && !$isbridge) {
if (defined($node->default_osid())) {
my $default_osinfo = OSImage->Lookup($node->default_osid());
$osname = $default_osinfo->osname()
......
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