Commit 69ab11de authored by Mike Hibler's avatar Mike Hibler
Browse files

Consider only nodes where role='testnode' for export info.

We were exporting to ops because of the opsnode experiment and
this breaks the ever-fragile BSD exports semantics when the fs node
is not the ops node.

Also got rid of another shark reference!
parent e552e461
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group. # Copyright (c) 2000-2005 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -200,7 +200,7 @@ $nodes_result = ...@@ -200,7 +200,7 @@ $nodes_result =
"left join interfaces as i on r.node_id=i.node_id ". "left join interfaces as i on r.node_id=i.node_id ".
" where i.IP!='NULL' and ". " where i.IP!='NULL' and ".
" i.role='" . TBDB_IFACEROLE_CONTROL() . "' ". " i.role='" . TBDB_IFACEROLE_CONTROL() . "' ".
" and r.node_id not like 'sh%' ". " and nodes.role='testnode' ".
" and node_types.isvirtnode=0 ". " and node_types.isvirtnode=0 ".
" and node_types.isremotenode=0 ". " and node_types.isremotenode=0 ".
"order by r.pid,e.gid,r.eid,nodes.priority"); "order by r.pid,e.gid,r.eid,nodes.priority");
......
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