in-job checks for acls are required for netdisco-do foreground actions
This commit is contained in:
@@ -58,7 +58,6 @@ sub _single_body {
|
||||
my $filter_method = $job_type .'_filter';
|
||||
my $job_filter = $self->$filter_method;
|
||||
|
||||
# failsafe, should not be needed with skip checks
|
||||
unless ($job_filter->($device->ip)) {
|
||||
return job_defer("$job_type deferred: $host is not ${job_type}able");
|
||||
}
|
||||
|
||||
@@ -54,7 +54,6 @@ sub discover {
|
||||
return job_done("discover skipped: $host is pseudo-device");
|
||||
}
|
||||
|
||||
# failsafe, should not be needed with skip checks
|
||||
unless (is_discoverable_now($device)) {
|
||||
return job_defer("discover deferred: $host is not discoverable");
|
||||
}
|
||||
|
||||
@@ -29,7 +29,6 @@ sub nbtstat {
|
||||
or job_error("nbtstat failed: unable to interpret device parameter");
|
||||
my $host = $device->ip;
|
||||
|
||||
# failsafe, should not be needed with skip checks
|
||||
unless (is_macsuckable($device)) {
|
||||
return job_defer("nbtstat deferred: $host is not macsuckable");
|
||||
}
|
||||
|
||||
@@ -145,8 +145,6 @@ sub jq_lock {
|
||||
# and the skiplist was primed. these should be checked against
|
||||
# the various acls and have device_skip entry added if needed,
|
||||
# and return false if it should have been skipped.
|
||||
# this is also why it's probably unnecessary to check is_* within
|
||||
# jobs, but we do that as well, just to be sure.
|
||||
my @badactions = _get_denied_actions($job->device);
|
||||
if (scalar @badactions) {
|
||||
schema('netdisco')->resultset('DeviceSkip')->find_or_create({
|
||||
|
||||
Reference in New Issue
Block a user