Commit 47b27f22 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Change jail IP net to 172.17 so its different than mini. Change

various defs files to reflect mini/main difference.
parent 64e9fb9c
...@@ -900,7 +900,7 @@ CLIENT_BINDIR="/usr/local/etc/emulab" ...@@ -900,7 +900,7 @@ CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab" CLIENT_VARDIR="/var/emulab"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
JAILIPBASE=172.16.0.0 JAILIPBASE=172.17.0.0
JAILIPMASK=255.240.0.0 JAILIPMASK=255.240.0.0
# #
......
...@@ -90,7 +90,7 @@ CLIENT_BINDIR="/usr/local/etc/emulab" ...@@ -90,7 +90,7 @@ CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab" CLIENT_VARDIR="/var/emulab"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
JAILIPBASE=172.16.0.0 JAILIPBASE=172.17.0.0
JAILIPMASK=255.240.0.0 JAILIPMASK=255.240.0.0
# #
......
...@@ -11,6 +11,8 @@ TBAUDITEMAIL=barb@cs.utah.edu ...@@ -11,6 +11,8 @@ TBAUDITEMAIL=barb@cs.utah.edu
TBACTIVEARCHIVE=barb@cs.utah.edu TBACTIVEARCHIVE=barb@cs.utah.edu
TBUSERSARCHIVE=barb@cs.utah.edu TBUSERSARCHIVE=barb@cs.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=1 DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net BOSSNODE=boss.mini.emulab.net
USERNODE=users.mini.emulab.net USERNODE=users.mini.emulab.net
......
...@@ -14,6 +14,8 @@ TBAUDITEMAIL=minitestbed-audit@flux.cs.utah.edu ...@@ -14,6 +14,8 @@ TBAUDITEMAIL=minitestbed-audit@flux.cs.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=1 DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net BOSSNODE=boss.mini.emulab.net
USERNODE=users.mini.emulab.net USERNODE=users.mini.emulab.net
......
...@@ -8,6 +8,8 @@ TBAUDITEMAIL=newbold+mini-log@flux.utah.edu ...@@ -8,6 +8,8 @@ TBAUDITEMAIL=newbold+mini-log@flux.utah.edu
TBACTIVEARCHIVE=newbold+activearch@flux.utah.edu TBACTIVEARCHIVE=newbold+activearch@flux.utah.edu
TBUSERSARCHIVE=newbold+usersarch@flux.utah.edu TBUSERSARCHIVE=newbold+usersarch@flux.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=1 DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net BOSSNODE=boss.mini.emulab.net
USERNODE=users.mini.emulab.net USERNODE=users.mini.emulab.net
......
...@@ -14,6 +14,8 @@ TBAUDITEMAIL=ricci@cs.utah.edu ...@@ -14,6 +14,8 @@ TBAUDITEMAIL=ricci@cs.utah.edu
TBACTIVEARCHIVE=ricci@cs.utah.edu TBACTIVEARCHIVE=ricci@cs.utah.edu
TBUSERSARCHIVE=ricci@cs.utah.edu TBUSERSARCHIVE=ricci@cs.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=1 DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net BOSSNODE=boss.mini.emulab.net
USERNODE=users.mini.emulab.net USERNODE=users.mini.emulab.net
......
...@@ -14,6 +14,8 @@ TBAUDITEMAIL=shash+mini-log@cs.utah.edu ...@@ -14,6 +14,8 @@ TBAUDITEMAIL=shash+mini-log@cs.utah.edu
TBACTIVEARCHIVE=shash+activearch@cs.utah.edu TBACTIVEARCHIVE=shash+activearch@cs.utah.edu
TBUSERSARCHIVE=shash+usersarch@cs.utah.edu TBUSERSARCHIVE=shash+usersarch@cs.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=1 DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net BOSSNODE=boss.mini.emulab.net
USERNODE=users.mini.emulab.net USERNODE=users.mini.emulab.net
......
...@@ -12,6 +12,8 @@ TBWWWEMAIL=stoller@fast.cs.utah.edu ...@@ -12,6 +12,8 @@ TBWWWEMAIL=stoller@fast.cs.utah.edu
TBAPPROVALEMAIL=stoller@fast.cs.utah.edu TBAPPROVALEMAIL=stoller@fast.cs.utah.edu
TBAUDITEMAIL=stoller@fast.cs.utah.edu TBAUDITEMAIL=stoller@fast.cs.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=1 DELAYCAPACITY=1
BOSSNODE=boss.mini.emulab.net BOSSNODE=boss.mini.emulab.net
USERNODE=users.mini.emulab.net USERNODE=users.mini.emulab.net
......
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