Commit c41f7357 authored by Mike Hibler's avatar Mike Hibler

Wee hack: attempt to detect when we need to gateway via ops.

We already did this for ELABINELAB configs, but now it also checks to
see if the control net prefix is "192.168" (you may retch now...)
parent 4897adec
......@@ -55,6 +55,11 @@ $isplab = $row["isplabdslice"];
$issubnode= $row["issubnode"];
$class = $row["class"];
#
# XXX hack to determine if target node is on a routable network
#
$unroutable = ($ELABINELAB || !strncmp($CONTROL_NETWORK, "192.168.", 8));
if (!isset($pid)) {
USERERROR("$node_id is not allocated to an experiment!", 1);
}
......@@ -86,7 +91,10 @@ if ($isvirt) {
echo "gateway: $USERNODE\n";
}
}
elseif ($ELABINELAB) {
elseif ($unroutable) {
#
# If nodes are unroutable, gateway via the user node
#
echo "gateway: $USERNODE\n";
}
elseif ($issubnode && $class == 'ixp') {
......
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