diff --git a/changelog/24325.txt b/changelog/24325.txt new file mode 100644 index 000000000..ab5ce613c --- /dev/null +++ b/changelog/24325.txt @@ -0,0 +1,4 @@ +```release-note:change +identity (enterprise): POST requests to the `/identity/entity/merge` endpoint +are now always forwarded from standbys to the active node. +``` \ No newline at end of file diff --git a/vault/identity_store_entities.go b/vault/identity_store_entities.go index ccc786e7d..629c94ed2 100644 --- a/vault/identity_store_entities.go +++ b/vault/identity_store_entities.go @@ -231,7 +231,8 @@ func entityPaths(i *IdentityStore) []*framework.Path { }, Operations: map[logical.Operation]framework.OperationHandler{ logical.UpdateOperation: &framework.PathOperation{ - Callback: i.pathEntityMergeID(), + Callback: i.pathEntityMergeID(), + ForwardPerformanceStandby: true, }, },