Commit 1014b976 authored by Kirk Webb's avatar Kirk Webb

Updates for storagehost client-side.

parent 89c88415
......@@ -122,6 +122,9 @@ my $sysname = `uname -s`;
chomp($sysname);
my $islinux = ($sysname eq "Linux");
# ...
my $isfreenas = -e "/etc/rc.freenas" ? 1 : 0;
#
# Put this into the background and log its output. We *must* do this cause
# we do not want to halt the boot if the testbed is down!
......@@ -243,7 +246,7 @@ sub prebootvnodes($$)
#
# XXX OS dependent stuff. Should move elsewhere.
#
if ($islinux) {
if ($islinux || $isfreenas) {
# This is handled in the libvnode libraries.
return;
}
......@@ -306,7 +309,7 @@ sub postbootvnodes($$)
#
# XXX OS dependent stuff. Should move elsewhere
#
if ($islinux) {
if ($islinux || $isfreenas) {
return;
}
......
......@@ -118,6 +118,8 @@ elsif (WINDOWS()) {
# rc.progagent is run by a separate service named ProgAgent.
# It's started by EmulabStartup after rc.bootsetup runs.
"rc.tarfiles", "rc.rpms");
} elsif (STORAGEHOST()) {
@bootscripts = ("rc.misc","rc.localize","rc.keys");
}
else {
@bootscripts = ("rc.firewall", "rc.tpmsetup",
......
......@@ -52,7 +52,7 @@ use Exporter;
SIMTRAFGEN SIMHOST ISDELAYNODEPATH JAILHOST DELAYHOST STARGATE
ISFW FAKEJAILED LINUXJAILED GENVNODE GENVNODETYPE GENVNODEHOST
SHAREDHOST SUBBOSS
SHAREDHOST SUBBOSS STORAGEHOST
CONFDIR LOGDIR TMDELAY TMBRIDGES TMJAILNAME TMSIMRC TMCC TMCCBIN
TMNICKNAME TMSTARTUPCMD FINDIF
......@@ -510,6 +510,7 @@ sub JAILHOST() { return (($role eq "virthost" ||
$role eq "sharedhost") ? 1 : 0); }
sub GENVNODEHOST() { if ($role eq "virthost") { return 1; } else { return 0; }}
sub SHAREDHOST() { return ($role eq "sharedhost" ? 1 : 0); }
sub STORAGEHOST() { return ($role eq "storagehost" ? 1 : 0); }
# A delay host? Either a delay node or a node using linkdelays
sub DELAYHOST() { if (-e ISDELAYNODEPATH()) { return 1; } else { return 0; } }
......
......@@ -376,7 +376,7 @@ sub doboot()
#
# For SHAREDHOSTs we now use clusterd (no pubsubd or evproxy).
#
if (SHAREDHOST()) {
if (SHAREDHOST() || STORAGEHOST()) {
#
# Kill off pubsubd and start clusterd.
#
......
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