Skip to content

Commit

Permalink
move variable out of oss-only build into shared file, fixes ent compi…
Browse files Browse the repository at this point in the history
…le error introduced by hashicorp#8834
  • Loading branch information
cgbaker authored and fredrikhgrelland committed Sep 28, 2020
1 parent cebfeba commit a1ff65b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 3 additions & 0 deletions nomad/job_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ const (
DispatchPayloadSizeLimit = 16 * 1024
)

// ErrMultipleNamespaces is send when multiple namespaces are used in the OSS setup
var ErrMultipleNamespaces = errors.New("multiple vault namespaces requires Nomad Enterprise")

var (
// allowRescheduleTransition is the transition that allows failed
// allocations to be force rescheduled. We create a one off
Expand Down
4 changes: 0 additions & 4 deletions nomad/job_endpoint_oss.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
package nomad

import (
"errors"
"fmt"
"strings"

"github.com/hashicorp/nomad/nomad/structs"
vapi "github.com/hashicorp/vault/api"
)

// ErrMultipleNamespaces is send when multiple namespaces are used in the OSS setup
var ErrMultipleNamespaces = errors.New("multiple vault namespaces requires Nomad Enterprise")

// enforceSubmitJob is used to check any Sentinel policies for the submit-job scope
func (j *Job) enforceSubmitJob(override bool, job *structs.Job) (error, error) {
return nil, nil
Expand Down

0 comments on commit a1ff65b

Please sign in to comment.