Reflect the new mothership boss/ops config.

defs-default

@@ -7,7 +7,7 @@
 #
 TBDBNAME=tbdb
 TBERRORLOGDBNAME=errorlog
-TBADMINGROUP=flux
+TBADMINGROUP=tbadmin
 TBOPSEMAIL=testbed-ops@flux.utah.edu
 TBLOGSEMAIL=testbed-logs@flux.utah.edu
 TBROBOCOPSEMAIL=testbed-robocops@flux.utah.edu
@@ -27,12 +27,12 @@ BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
 FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net
-FSDIR_GROUPS=/q/groups
-FSDIR_PROJ=/q/proj
+FSDIR_GROUPS=/groups
+FSDIR_PROJ=/proj
 FSDIR_USERS=/users
 FSDIR_SHARE=/share
-FSDIR_SCRATCH=/z/scratch
-FS_WITH_QUOTAS="/q /z /users"
+FSDIR_SCRATCH=
+FS_WITH_QUOTAS=
 WWWHOST=www.emulab.net
 TBMAINSITE=1
 THISHOMEBASE=Emulab.Net
@@ -40,7 +40,7 @@ MIN_UNIX_UID=10000
 MIN_UNIX_GID=6000
 WINSUPPORT=1
 ELVIN_COMPAT=0
-NSVERIFY=1
+NSVERIFY=0
 TBUSEDBI=1
 
 # Set to one to disable exporting NFS filesystems to nodes
@@ -48,7 +48,7 @@ NOSHAREDFS=0
 
 # Set to one if you are using an NFS server that has an exports race
 # If you don't know what this means, leave it at one, it won't hurt
-NFSRACY=1
+NFSRACY=0
 
 #
 # IQN prefix for iSCSI blockstores
@@ -87,7 +87,7 @@ SFSSUPPORT=0
 CVSSUPPORT=0
 STAMPS=1
 CHATSUPPORT=0
-NFSTRACESUPPORT=1
+NFSTRACESUPPORT=0
 ARCHIVESUPPORT=0
 OPSDBSUPPORT=0
 PELABSUPPORT=0
@@ -129,7 +129,7 @@ EXTERNAL_BOSSNODE_IP=$BOSSNODE_IP
 USERNODE_IP=155.98.33.74
 EXTERNAL_USERNODE_IP=$USERNODE_IP
 FSNODE_IP=$USERNODE_IP
-EXTERNAL_FSNODE_IP=$USERNODE_IP
+EXTERNAL_FSNODE_IP=$EXTERNAL_USERNODE_IP
 CONTROL_ROUTER_IP=155.98.36.1
 CONTROL_NETWORK=155.98.36.0
 CONTROL_NETMASK=255.255.252.0
@@ -170,3 +170,14 @@ BROWSER_CONSOLE_ENABLE=1
 # Image versioning and deltas.
 IMAGEPROVENANCE=1
 IMAGEDELTAS=1
+
+# ZFS.
+WITHZFS=1
+ZFS_ROOT=z
+ZFS_QUOTA_USER="1G"
+ZFS_QUOTA_PROJECT="100G"
+ZFS_QUOTA_GROUP="5G"
+WITHAMD=0
+
+# Blockstores
+BS_IQN_PREFIX=iqn.2000-10.net.emulab