Commit a6f79ed2 authored by Leigh B Stoller's avatar Leigh B Stoller

Add OPSVM_ENABLE changes; we do not need to do arplockdown on ops when

it is a jail, and it's mac is the same as boss.
parent 2f41610c
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2003-2014 University of Utah and the Flux Group. # Copyright (c) 2003-2014, 2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -61,6 +61,7 @@ my $PRIVATE_MASK= "@PRIVATE_NETMASK@"; ...@@ -61,6 +61,7 @@ my $PRIVATE_MASK= "@PRIVATE_NETMASK@";
my $JAIL_NET = "@JAILIPBASE@"; my $JAIL_NET = "@JAILIPBASE@";
my $JAIL_MASK = "@JAILIPMASK@"; my $JAIL_MASK = "@JAILIPMASK@";
my $BOSSNODE_IP = "@BOSSNODE_IP@"; my $BOSSNODE_IP = "@BOSSNODE_IP@";
my $OPSVM_ENABLE= @OPSVM_ENABLE@;
my $SAVEUID = $UID; my $SAVEUID = $UID;
my $ARP = "/usr/sbin/arp"; my $ARP = "/usr/sbin/arp";
my $FINDIF = "$TB/sbin/findif"; my $FINDIF = "$TB/sbin/findif";
...@@ -150,7 +151,7 @@ $UID = 0; ...@@ -150,7 +151,7 @@ $UID = 0;
# #
# First, update the lockdown on the FS/OPs node. # First, update the lockdown on the FS/OPs node.
# #
if (!$impotent) { if (!$impotent && !$OPSVM_ENABLE) {
my $optarg = ($verbose ? "-v" : ""); my $optarg = ($verbose ? "-v" : "");
SSHwithTimeout($CONTROL, "$FIXARPINFO $optarg -u -t 5", 30, $verbose) == 0 SSHwithTimeout($CONTROL, "$FIXARPINFO $optarg -u -t 5", 30, $verbose) == 0
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2012 University of Utah and the Flux Group. # Copyright (c) 2012, 2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -49,6 +49,7 @@ my $hostip; ...@@ -49,6 +49,7 @@ my $hostip;
# #
my $TB = "@prefix@"; my $TB = "@prefix@";
my $SBINDIR = "$TB/sbin"; my $SBINDIR = "$TB/sbin";
my $OPSVM_ENABLE= @OPSVM_ENABLE@;
my $NC_NET = "@CONTROL_NETWORK@"; my $NC_NET = "@CONTROL_NETWORK@";
my $NC_MASK = "@CONTROL_NETMASK@"; my $NC_MASK = "@CONTROL_NETMASK@";
...@@ -345,6 +346,9 @@ sub GetMACs() ...@@ -345,6 +346,9 @@ sub GetMACs()
if ($opsoncnet) { if ($opsoncnet) {
$ops_mac = GetMACFromARP($host, $OPS_IP); $ops_mac = GetMACFromARP($host, $OPS_IP);
} }
elsif ($OPSVM_ENABLE) {
$ops_mac = $boss_mac;
}
if ($fsoncnet) { if ($fsoncnet) {
if ($fsisops) { if ($fsisops) {
$fs_mac = $ops_mac; $fs_mac = $ops_mac;
......
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