Commit 464a175a authored by Mike Hibler's avatar Mike Hibler

Make sure all built-in elabinelab OSID defaults are FBSD83.

parent 08a51946
#
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -127,6 +127,6 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
}
} else {
tb-set-node-os $myboss FBSD73-STD
tb-set-node-os $myboss FBSD83-STD
}
tb-set-node-loadlist $myboss FBSD73-S2
tb-set-node-loadlist $myboss FBSD83-S2
#
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -177,7 +177,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
}
} else {
tb-set-node-os $myboss FBSD63-STD
tb-set-node-os $myboss FBSD83-STD
}
if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
......@@ -189,7 +189,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
tb-set-node-os $myops $sitevariables(elabinelab/ops_osid)
}
} else {
tb-set-node-os $myops FBSD63-STD
tb-set-node-os $myops FBSD83-STD
}
if {[info exists ::TBCOMPAT::elabinelab_nodeos("fs")]} {
......@@ -201,5 +201,5 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("fs")]} {
tb-set-node-os $myfs $sitevariables(elabinelab/fs_osid)
}
} else {
tb-set-node-os $myfs FBSD63-STD
tb-set-node-os $myfs FBSD83-STD
}
#
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -153,7 +153,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
}
} else {
tb-set-node-os $myboss FBSD73-STD
tb-set-node-os $myboss FBSD83-STD
}
if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
......@@ -165,5 +165,5 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
tb-set-node-os $myops $sitevariables(elabinelab/ops_osid)
}
} else {
tb-set-node-os $myops FBSD73-STD
tb-set-node-os $myops FBSD83-STD
}
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -646,9 +646,9 @@ sub GenDefsFile($)
#
my %defvalues = (
"elabinelab/singlenet" => 0,
"elabinelab/boss_osid" => "FBSD73-STD",
"elabinelab/ops_osid" => "FBSD73-STD",
"elabinelab/fs_osid" => "FBSD73-STD"
"elabinelab/boss_osid" => "FBSD83-STD",
"elabinelab/ops_osid" => "FBSD83-STD",
"elabinelab/fs_osid" => "FBSD83-STD"
);
while (my ($var, $def) = each(%defvalues)) {
if (!exists($sitevars{$var})) {
......
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