From b05ebe25075581be63dbf13d3406470fa854ff05 Mon Sep 17 00:00:00 2001 From: Kyle Havlovitz Date: Mon, 2 Mar 2020 10:30:23 -0800 Subject: [PATCH] Add stub methods for ACL/segment bug fix from enterprise --- agent/consul/acl_server.go | 1 + agent/consul/acl_server_oss.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/agent/consul/acl_server.go b/agent/consul/acl_server.go index 558e93b09..086219a12 100644 --- a/agent/consul/acl_server.go +++ b/agent/consul/acl_server.go @@ -91,6 +91,7 @@ func (s *Server) updateACLAdvertisement() { // always advertise to all the LAN Members lib.UpdateSerfTag(s.serfLAN, "acls", string(structs.ACLModeEnabled)) + s.updateSegmentACLAdvertisements() if s.serfWAN != nil { // advertise on the WAN only when we are inside the ACL datacenter diff --git a/agent/consul/acl_server_oss.go b/agent/consul/acl_server_oss.go index 32aedd940..2730f3ce7 100644 --- a/agent/consul/acl_server_oss.go +++ b/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 { return nil } + +// Consul-enterprise only +func (s *Server) updateSegmentACLAdvertisements() {}