Commit b83f757f authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minor fix for OPSVM_ENABLE.

parent 24349147
...@@ -47,6 +47,8 @@ my $GW_IP = "@CONTROL_ROUTER_IP@"; ...@@ -47,6 +47,8 @@ my $GW_IP = "@CONTROL_ROUTER_IP@";
my $BOSS_IP = "@BOSSNODE_IP@"; my $BOSS_IP = "@BOSSNODE_IP@";
my $OPS_IP = "@USERNODE_IP@"; my $OPS_IP = "@USERNODE_IP@";
my $FS_IP = "@FSNODE_IP@"; my $FS_IP = "@FSNODE_IP@";
# Are we a VM on boss?
$OPSVM_ENABLE = @OPSVM_ENABLE@;
# #
# Untaint the path # Untaint the path
...@@ -111,7 +113,7 @@ AddServer("ops", $ip, $mac) == 0 ...@@ -111,7 +113,7 @@ AddServer("ops", $ip, $mac) == 0
# #
# fs # fs
# #
if ($OPS_IP ne $FS_IP) { if ($OPS_IP ne $FS_IP && !$OPSVM_ENABLE) {
$ip = $FS_IP; $ip = $FS_IP;
$mac = GetSiteVar("node/fs_mac"); $mac = GetSiteVar("node/fs_mac");
fatal("No MAC for fs") fatal("No MAC for fs")
......
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