Commit 6fe35a4a authored by Leigh Stoller's avatar Leigh Stoller

Oops, lets use USERNODE_IP instead of OPSNODE_IP to be consistent.

parent 8e4bddaa
...@@ -938,7 +938,7 @@ UNIFIED_BOSS_AND_OPS=0 ...@@ -938,7 +938,7 @@ UNIFIED_BOSS_AND_OPS=0
# too many defs files too worry about right now. # too many defs files too worry about right now.
# #
BOSSNODE_IP=155.98.32.70 BOSSNODE_IP=155.98.32.70
OPSNODE_IP=155.98.33.74 USERNODE_IP=155.98.33.74
CONTROL_ROUTER_IP=155.98.36.1 CONTROL_ROUTER_IP=155.98.36.1
CONTROL_NETWORK=155.98.36.0 CONTROL_NETWORK=155.98.36.0
CONTROL_NETMASK=255.255.252.0 CONTROL_NETMASK=255.255.252.0
...@@ -1757,7 +1757,7 @@ s%@PLAB_ROOTBALL@%$PLAB_ROOTBALL%g ...@@ -1757,7 +1757,7 @@ s%@PLAB_ROOTBALL@%$PLAB_ROOTBALL%g
s%@PLAB_SLICEPREFIX@%$PLAB_SLICEPREFIX%g s%@PLAB_SLICEPREFIX@%$PLAB_SLICEPREFIX%g
s%@LINKTEST_NSPATH@%$LINKTEST_NSPATH%g s%@LINKTEST_NSPATH@%$LINKTEST_NSPATH%g
s%@BOSSNODE_IP@%$BOSSNODE_IP%g s%@BOSSNODE_IP@%$BOSSNODE_IP%g
s%@OPSNODE_IP@%$OPSNODE_IP%g s%@USERNODE_IP@%$USERNODE_IP%g
s%@CONTROL_ROUTER_IP@%$CONTROL_ROUTER_IP%g s%@CONTROL_ROUTER_IP@%$CONTROL_ROUTER_IP%g
s%@CONTROL_NETWORK@%$CONTROL_NETWORK%g s%@CONTROL_NETWORK@%$CONTROL_NETWORK%g
s%@CONTROL_NETMASK@%$CONTROL_NETMASK%g s%@CONTROL_NETMASK@%$CONTROL_NETMASK%g
......
...@@ -66,7 +66,7 @@ AC_SUBST(PLAB_ROOTBALL) ...@@ -66,7 +66,7 @@ AC_SUBST(PLAB_ROOTBALL)
AC_SUBST(PLAB_SLICEPREFIX) AC_SUBST(PLAB_SLICEPREFIX)
AC_SUBST(LINKTEST_NSPATH) AC_SUBST(LINKTEST_NSPATH)
AC_SUBST(BOSSNODE_IP) AC_SUBST(BOSSNODE_IP)
AC_SUBST(OPSNODE_IP) AC_SUBST(USERNODE_IP)
AC_SUBST(CONTROL_ROUTER_IP) AC_SUBST(CONTROL_ROUTER_IP)
AC_SUBST(CONTROL_NETWORK) AC_SUBST(CONTROL_NETWORK)
AC_SUBST(CONTROL_NETMASK) AC_SUBST(CONTROL_NETMASK)
...@@ -130,7 +130,7 @@ UNIFIED_BOSS_AND_OPS=0 ...@@ -130,7 +130,7 @@ UNIFIED_BOSS_AND_OPS=0
# too many defs files too worry about right now. # too many defs files too worry about right now.
# #
BOSSNODE_IP=155.98.32.70 BOSSNODE_IP=155.98.32.70
OPSNODE_IP=155.98.33.74 USERNODE_IP=155.98.33.74
CONTROL_ROUTER_IP=155.98.36.1 CONTROL_ROUTER_IP=155.98.36.1
CONTROL_NETWORK=155.98.36.0 CONTROL_NETWORK=155.98.36.0
CONTROL_NETMASK=255.255.252.0 CONTROL_NETMASK=255.255.252.0
......
...@@ -38,7 +38,7 @@ PLAB_ROOTBALL="plabroot-10.tar.bz2" ...@@ -38,7 +38,7 @@ PLAB_ROOTBALL="plabroot-10.tar.bz2"
# Network config stuff. Used to generate initial named and dhcpd config files. # Network config stuff. Used to generate initial named and dhcpd config files.
# #
BOSSNODE_IP=155.98.32.70 BOSSNODE_IP=155.98.32.70
OPSNODE_IP=155.98.33.74 USERNODE_IP=155.98.33.74
CONTROL_ROUTER_IP=155.98.36.1 CONTROL_ROUTER_IP=155.98.36.1
CONTROL_NETWORK=155.98.36.0 CONTROL_NETWORK=155.98.36.0
CONTROL_NETMASK=255.255.252.0 CONTROL_NETMASK=255.255.252.0
......
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