Commit 055485ea authored by Kirk Webb's avatar Kirk Webb

Don't look at expt state when modifying dhcpd.conf for external managment.

For externally managed experiments, don't consider the current state of
the experiment.  If a node is reserved to the experiment, period, then its
entry needs to be disabled in dhcp.  Otherwise the next time dhcp_makeconf
runs, any already active externally managed experiments will revert to Emulab
dhcp.
parent 270ee757
......@@ -300,7 +300,7 @@ while (<IF>) {
# currently reserved to an experiment. In
# addition to setting a simple tag for further
# lookups below, check to see if a node's current
# experiment is swapping in AND is marked for
# experiment is marked for
# external management. This state is used below in
# determining whether or not to disable a node in
# the dhcp config file. Keep a cache of this
......@@ -317,8 +317,7 @@ while (<IF>) {
defined($experiment) &&
EmulabFeatures->FeatureEnabled(
"ExternalNodeManagement", undef, undef,
$experiment) &&
$experiment->state() eq EXPTSTATE_ACTIVATING();
$experiment);
}
else {
$extman = $extman_cache{$tag};
......
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