Browse Source

Add stub methods for ACL/segment bug fix from enterprise

pull/7373/head
Kyle Havlovitz 5 years ago
parent
commit
7c57837908
  1. 1
      agent/consul/acl_server.go
  2. 3
      agent/consul/acl_server_oss.go

1
agent/consul/acl_server.go

@ -91,6 +91,7 @@ func (s *Server) updateACLAdvertisement() {
// always advertise to all the LAN Members // always advertise to all the LAN Members
lib.UpdateSerfTag(s.serfLAN, "acls", string(structs.ACLModeEnabled)) lib.UpdateSerfTag(s.serfLAN, "acls", string(structs.ACLModeEnabled))
s.updateSegmentACLAdvertisements()
if s.serfWAN != nil { if s.serfWAN != nil {
// advertise on the WAN only when we are inside the ACL datacenter // advertise on the WAN only when we are inside the ACL datacenter

3
agent/consul/acl_server_oss.go

@ -16,3 +16,6 @@ func (s *Server) ResolveEntTokenToIdentityAndAuthorizer(token string) (structs.A
func (s *Server) validateEnterpriseToken(identity structs.ACLIdentity) error { func (s *Server) validateEnterpriseToken(identity structs.ACLIdentity) error {
return nil return nil
} }
// Consul-enterprise only
func (s *Server) updateSegmentACLAdvertisements() {}

Loading…
Cancel
Save