Commit 908cb2e7 authored by Leigh Stoller's avatar Leigh Stoller

We need an IN NS to ns.emulab.net. for geniracks since Utah is

secondary.
parent e31a5d1a
......@@ -11,6 +11,7 @@ $TTL 30
3600000 ; Expire
3600 ) ; Minimum
IN NS ns.@OURDOMAIN@.
%secondaries%
$TTL 30
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -38,6 +38,7 @@ sub usage {
# Configure variables
#
my $OURDOMAIN = "@OURDOMAIN@";
my $PROTOGENI_GENIRACK = @PROTOGENI_GENIRACK@;
my ($BOSSTOKEN) = ("@BOSSNODE@" =~ /^([-\w]+).*$/);
my ($USERTOKEN) = ("@USERNODE@" =~ /^([-\w]+).*$/);
my ($FSTOKEN) = ("@FSNODE@" =~ /^([-\w]+).*$/);
......@@ -66,7 +67,6 @@ my $NAMED_FORWARDERS = "@NAMED_FORWARDERS@";
my $MXSTR = "\t\tIN\tMX 10\tops\n";
# Testbed libraries.
use lib "@prefix@/lib";
#use libdb;
......@@ -210,6 +210,14 @@ while (<IF>) {
$external_strings .= $foo
if (isroutable($CONTROL_ROUTER_IP));
}
elsif ($2 eq "secondaries") {
if ($PROTOGENI_GENIRACK) {
my $foo = " IN NS ns.emulab.net.\n";
$internal_strings .= $foo;
$external_strings .= $foo;
}
}
else {
die("*** $0:\n".
" Unknown special tag in named template file!\n");
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -38,6 +38,7 @@ sub usage {
# Configure variables
#
my $ELABINELAB = "@ELABINELAB@";
my $PROTOGENI_GENIRACK = @PROTOGENI_GENIRACK@;
my $OURDOMAIN = "@OURDOMAIN@";
my $TESTBED_NETWORK = "@TESTBED_NETWORK@";
my $TESTBED_NETMASK = "@TESTBED_NETMASK@";
......@@ -99,6 +100,10 @@ for (my $i = $jb; $i <= $jb + (255 - $jmb); $i++) {
system("cp -f reverse.head $internal_revfile") == 0 or
die("Unable to copy $infile to $internal_revfile\n");
if ($PROTOGENI_GENIRACK) {
system("echo ' IN NS ns.emulab.net.' >> $internal_revfile");
}
#
# This is for the case that boss/ops/fs are actually *in* the jail
# network space, as would happen in an elabinelab that is using a
......@@ -139,6 +144,10 @@ for (my $i = $ic; $i <= $ic + (255 - $imc); $i++) {
system("cp -f reverse.head $internal_revfile") == 0 or
die("Unable to copy $infile to $internal_revfile\n");
if ($PROTOGENI_GENIRACK) {
system("echo ' IN NS ns.emulab.net.' >> $internal_revfile");
}
open(REV, ">>$internal_revfile")
or die("Unable to open $internal_revfile for appending!\n");
print REV "\n";
......
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