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

Merge pull request #2793 from hashicorp/b-dereg-acl

Browse source 
Adds token to deregister request when reconciling.
This commit is contained in:
James Phillips 2017-03-09 09:27:41 -08:00 committed by GitHub
parent 61ea6faf6c 1e313e339c
commit 9ed7b7de72
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
consul/leader.go
View file

@ -548,8 +548,9 @@ func (s *Server) handleDeregisterMember(reason string, member serf.Member) error
// Deregister the node // Deregister the node
s.logger.Printf("[INFO] consul: member '%s' %s, deregistering", member.Name, reason) s.logger.Printf("[INFO] consul: member '%s' %s, deregistering", member.Name, reason)
req := structs.DeregisterRequest{ req := structs.DeregisterRequest{
Datacenter: s.config.Datacenter, Datacenter: s.config.Datacenter,
Node: member.Name, Node: member.Name,
WriteRequest: structs.WriteRequest{Token: s.config.GetTokenForAgent()},
} }
var out struct{} var out struct{}
return s.endpoints.Catalog.Deregister(&req, &out) return s.endpoints.Catalog.Deregister(&req, &out)