luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #7373 from hashicorp/acl-segments-fix 

Add stub methods for ACL/segment bug fix from enterprise
This commit is contained in:
Kyle Havlovitz 2020-03-09 14:25:49 -07:00 committed by GitHub
parent 3ca1216876 b05ebe2507
commit 520d464c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/consul/acl_server.go
View File

@ -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
View File

@ -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() {}