Commit 76d7f149 authored by Leigh Stoller's avatar Leigh Stoller

Add new definitions for OPS as a VM (jail) on boss.

    
    OPSVM_ENABLE=0
    OPSVM_MOUNTPOINT=""
parent e6f27a41
...@@ -84,6 +84,8 @@ HAVE_MEZZANINE = @HAVE_MEZZANINE@ ...@@ -84,6 +84,8 @@ HAVE_MEZZANINE = @HAVE_MEZZANINE@
GTK_CONFIG = @GTK_CONFIG@ GTK_CONFIG = @GTK_CONFIG@
BRAINSTEM_DIR = @BRAINSTEM_DIR@ BRAINSTEM_DIR = @BRAINSTEM_DIR@
WITH_EMULAB = @WITH_EMULAB@ WITH_EMULAB = @WITH_EMULAB@
OPSVM_ENABLE = @OPSVM_ENABLE@
OPSVM_MOUNTPOINT= @OPSVM_MOUNTPOINT@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
......
...@@ -54,3 +54,5 @@ ...@@ -54,3 +54,5 @@
#undef HAVE_LINUX_VIDEODEV_H #undef HAVE_LINUX_VIDEODEV_H
#undef HAVE_MEZZANINE #undef HAVE_MEZZANINE
#undef OPSVM_ENABLE
#undef OPSVM_MOUNTPOINT
...@@ -827,6 +827,8 @@ NOSHAREDFS ...@@ -827,6 +827,8 @@ NOSHAREDFS
SELFLOADER_DATA SELFLOADER_DATA
TBUSEDBI TBUSEDBI
NEEDMROUTED NEEDMROUTED
OPSVM_ENABLE
OPSVM_MOUNTPOINT
TBOPSEMAIL TBOPSEMAIL
TBOPSEMAIL_NOSLASH TBOPSEMAIL_NOSLASH
TBROBOCOPSEMAIL TBROBOCOPSEMAIL
...@@ -4947,6 +4949,8 @@ done ...@@ -4947,6 +4949,8 @@ done
...@@ -5044,6 +5048,8 @@ NOSHAREDFS=0 ...@@ -5044,6 +5048,8 @@ NOSHAREDFS=0
NFSRACY=1 NFSRACY=1
SELFLOADER_DATA="__DATA__" SELFLOADER_DATA="__DATA__"
NEEDMROUTED=0 NEEDMROUTED=0
OPSVM_ENABLE=0
OPSVM_MOUNTPOINT="/ops"
# #
# XXX You really don't want to change these! # XXX You really don't want to change these!
...@@ -5189,6 +5195,11 @@ elif test "$USERNODE" = "$FSNODE"; then ...@@ -5189,6 +5195,11 @@ elif test "$USERNODE" = "$FSNODE"; then
#define FSNODE_IP "$USERNODE_IP" #define FSNODE_IP "$USERNODE_IP"
_ACEOF _ACEOF
elif test "$BOSSNODE" = "$FSNODE"; then
cat >>confdefs.h <<_ACEOF
#define FSNODE_IP "$BOSSNODE_IP"
_ACEOF
fi fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define CONTROL_ROUTER_IP "$CONTROL_ROUTER_IP" #define CONTROL_ROUTER_IP "$CONTROL_ROUTER_IP"
...@@ -5313,6 +5324,16 @@ if test $NFSRACY -eq 1; then ...@@ -5313,6 +5324,16 @@ if test $NFSRACY -eq 1; then
#define NFSRACY 1 #define NFSRACY 1
_ACEOF _ACEOF
fi
if test $OPSVM_ENABLE -eq 1; then
cat >>confdefs.h <<_ACEOF
#define OPSVM_ENABLE 1
_ACEOF
cat >>confdefs.h <<_ACEOF
#define OPSVM_MOUNTPOINT $OPSVM_MOUNTPOINT
_ACEOF
fi fi
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z` LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
......
...@@ -225,6 +225,8 @@ AC_SUBST(NOSHAREDFS) ...@@ -225,6 +225,8 @@ AC_SUBST(NOSHAREDFS)
AC_SUBST(SELFLOADER_DATA) AC_SUBST(SELFLOADER_DATA)
AC_SUBST(TBUSEDBI) AC_SUBST(TBUSEDBI)
AC_SUBST(NEEDMROUTED) AC_SUBST(NEEDMROUTED)
AC_SUBST(OPSVM_ENABLE)
AC_SUBST(OPSVM_MOUNTPOINT)
# #
# Offer both versions of the email addresses that have the @ escaped # Offer both versions of the email addresses that have the @ escaped
...@@ -320,6 +322,8 @@ NOSHAREDFS=0 ...@@ -320,6 +322,8 @@ NOSHAREDFS=0
NFSRACY=1 NFSRACY=1
SELFLOADER_DATA="__DATA__" SELFLOADER_DATA="__DATA__"
NEEDMROUTED=0 NEEDMROUTED=0
OPSVM_ENABLE=0
OPSVM_MOUNTPOINT="/ops"
# #
# XXX You really don't want to change these! # XXX You really don't want to change these!
...@@ -401,6 +405,8 @@ if test -n "$FSNODE_IP"; then ...@@ -401,6 +405,8 @@ if test -n "$FSNODE_IP"; then
AC_DEFINE_UNQUOTED(FSNODE_IP, "$FSNODE_IP") AC_DEFINE_UNQUOTED(FSNODE_IP, "$FSNODE_IP")
elif test "$USERNODE" = "$FSNODE"; then elif test "$USERNODE" = "$FSNODE"; then
AC_DEFINE_UNQUOTED(FSNODE_IP, "$USERNODE_IP") AC_DEFINE_UNQUOTED(FSNODE_IP, "$USERNODE_IP")
elif test "$BOSSNODE" = "$FSNODE"; then
AC_DEFINE_UNQUOTED(FSNODE_IP, "$BOSSNODE_IP")
fi fi
AC_DEFINE_UNQUOTED(CONTROL_ROUTER_IP, "$CONTROL_ROUTER_IP") AC_DEFINE_UNQUOTED(CONTROL_ROUTER_IP, "$CONTROL_ROUTER_IP")
AC_DEFINE_UNQUOTED(CONTROL_NETWORK, "$CONTROL_NETWORK") AC_DEFINE_UNQUOTED(CONTROL_NETWORK, "$CONTROL_NETWORK")
...@@ -451,6 +457,10 @@ fi ...@@ -451,6 +457,10 @@ fi
if test $NFSRACY -eq 1; then if test $NFSRACY -eq 1; then
AC_DEFINE_UNQUOTED(NFSRACY, 1) AC_DEFINE_UNQUOTED(NFSRACY, 1)
fi fi
if test $OPSVM_ENABLE -eq 1; then
AC_DEFINE_UNQUOTED(OPSVM_ENABLE, 1)
AC_DEFINE_UNQUOTED(OPSVM_MOUNTPOINT, $OPSVM_MOUNTPOINT)
fi
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z` LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
AC_DEFINE_UNQUOTED(LOG_TESTBED, $LOG_TESTBED) AC_DEFINE_UNQUOTED(LOG_TESTBED, $LOG_TESTBED)
......
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