Commit 5fc7c476 authored by Mike Hibler's avatar Mike Hibler

Enable NTP on inner ops so that nodes can synch their time.

We thought we had it on all this time, but we have been enabling "xntpd"
in /etc/rc.conf, but it has been "ntpd" since about FreeBSD 5.
parent a48c6905
......@@ -39,7 +39,7 @@ THISHOMEBASE=Emulab.Net
MIN_UNIX_UID=10000
MIN_UNIX_GID=6000
WINSUPPORT=1
ELVIN_COMPAT=1
ELVIN_COMPAT=0
NSVERIFY=1
# Set to one to disable exporting NFS filesystems to nodes
......
#!/bin/sh
#
# Fiecely bogus script to attempt to upgrade ports on an existing Emulab server
# Fiercely bogus script to attempt to upgrade ports on an existing Emulab server
#
#DO=echo
DO=
DO=echo
#DO=
if [ -z "$1" ]; then
echo '*** Usage: update-ports [boss|ops]'
......
......@@ -178,6 +178,10 @@ ENHANCEMENTS:
Minor changes would be needed to PacketSend/Recv to track the client
IP/port rather than just assuming/using the global mcastaddr/portnum.
One nice side-effect of this is that the client would no longer have
to bind to a specific port in the unicast case, since each reply from
the server could be tagged with the proper destination port.
9. Allow the frisbee client to be used in a pipe.
If we could pipe the output of frisbee into another utility, this would
......
......@@ -506,16 +506,23 @@ while (my %row = $db_result->fetchhash()) {
}
#
# XXX Inner elab nodes should never report in to us.
# If they do, make sure they wind up in PXEWAIT.
# XXX Inner elab fu.
# 1. If nodes try to report in to us, make sure they wind up in PXEWAIT
# (ClearOsids)
# 2. Make sure nodes appear successfully allocated
# (SetBootStatus, SetAllocState)
# Note that they will appear to be in PXEWAIT via the web interface.
# Maybe we should
#
if (keys(%einenodes)) {
DBQueryFatal("update nodes set ".
" def_boot_osid=NULL,".
" next_boot_osid=NULL,".
" temp_boot_osid=NULL ".
"where node_id in (".
join(",", map("'$_'", keys %einenodes)). ")");
foreach my $node (keys %einenodes) {
my $nodeobj = $nodeobjs{$node};
if ($nodeobj) {
$nodeobj->ClearOsids();
$nodeobj->SetBootStatus(NODEBOOTSTATUS_OKAY);
$nodeobj->SetAllocState(TBDB_ALLOCSTATE_RES_READY());
}
}
}
@all_nodes = (keys %nodes, keys %vnodes);
......
......@@ -783,7 +783,11 @@ sub SetupFsNode()
print RC "ntpdate_enable=\"YES\"\n";
print RC "ntpdate_flags=\"boss\"\n";
print RC "xntpd_enable=\"YES\"\n";
if ($FBSD_VERSION >= 5) {
print RC "ntpd_enable=\"YES\"\n";
} else {
print RC "xntpd_enable=\"YES\"\n";
}
print RC "linux_enable=\"YES\"\n";
print RC "rpcbind_enable=\"YES\"\n";
......@@ -1196,7 +1200,11 @@ sub SetupOpsNode($)
print RC "ntpdate_enable=\"YES\"\n";
print RC "ntpdate_flags=\"boss\"\n";
print RC "xntpd_enable=\"YES\"\n";
if ($FBSD_VERSION >= 5) {
print RC "ntpd_enable=\"YES\"\n";
} else {
print RC "xntpd_enable=\"YES\"\n";
}
print RC "linux_enable=\"YES\"\n";
print RC "accounting_enable=\"YES\"\n";
......
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