Change the default IPBASE to 10. addresses. BE SURE TO RECONFIGURE!

configure

@@ -901,7 +901,7 @@ TBSECURECOOKIES=1
 TBMAINSITE=0
 JAILIPBASE=172.17.0.0
 JAILIPMASK=255.240.0.0
-IPBASE=192.168
+IPBASE=10
 SFSSUPPORT=1
 
 #

configure.in

@@ -93,7 +93,7 @@ TBSECURECOOKIES=1
 TBMAINSITE=0
 JAILIPBASE=172.17.0.0
 JAILIPMASK=255.240.0.0
-IPBASE=192.168
+IPBASE=10
 SFSSUPPORT=1
 
 #

defs-mini

@@ -13,7 +13,6 @@ TBAPPROVALEMAIL=minitestbed-approval@flux.cs.utah.edu
 TBAUDITEMAIL=minitestbed-audit@flux.cs.utah.edu
 TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
 TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
-IPBASE=192.168
 JAILIPBASE=172.16.0.0
 JAILIPMASK=255.240.0.0
 DELAYCAPACITY=1

defs-shash-mini

@@ -13,7 +13,6 @@ TBAPPROVALEMAIL=shash+mini-approve@cs.utah.edu
 TBAUDITEMAIL=shash+mini-log@cs.utah.edu
 TBACTIVEARCHIVE=shash+activearch@cs.utah.edu
 TBUSERSARCHIVE=shash+usersarch@cs.utah.edu
-IPBASE=192.168
 JAILIPBASE=172.16.0.0
 JAILIPMASK=255.240.0.0
 DELAYCAPACITY=1

defs-stoller-emulab

@@ -7,7 +7,6 @@ TBLOGSEMAIL=stoller@flux.utah.edu
 TBWWWEMAIL=stoller@flux.utah.edu
 TBAPPROVALEMAIL=stoller@flux.utah.edu
 TBAUDITEMAIL=stoller@flux.utah.edu
-IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net

defs-stoller-home

@@ -7,10 +7,10 @@ TBLOGSEMAIL=stoller@stoller.casco.net
 TBWWWEMAIL=stoller@stoller.casco.net
 TBAPPROVALEMAIL=stoller@stoller.casco.net
 TBAUDITEMAIL=stoller@stoller.casco.net
-IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=golden-gw.ballmoss.com
 USERNODE=golden-gw.ballmoss.com
+UNIFIED_BOSS_AND_OPS=1
 FSNODE=golden-gw.ballmoss.com
 OURDOMAIN=ballmoss.com
 FSDIR_GROUPS=/groups

defs-stoller-mini

@@ -11,7 +11,6 @@ TBLOGSEMAIL=stoller@fast.cs.utah.edu
 TBWWWEMAIL=stoller@fast.cs.utah.edu
 TBAPPROVALEMAIL=stoller@fast.cs.utah.edu
 TBAUDITEMAIL=stoller@fast.cs.utah.edu
-IPBASE=192.168
 JAILIPBASE=172.16.0.0
 JAILIPMASK=255.240.0.0
 DELAYCAPACITY=1