From: Ken Gaillot <kgaillot@redhat.com>
Date: Thu, 27 Aug 2015 11:00:02 -0500
Subject: [PATCH] Fix: crmd: don't add node ID to proxied remote node requests
 for attrd

446a1005 incorrectly set F_ATTRD_HOST_ID for proxied remote node requests to
attrd. Since attrd only uses F_ATTRD_HOST_ID to associate a cluster node name
with an ID, it doesn't ever need to be set for remote nodes.

Additionally, that revision used the proxying cluster node's node ID, which can
lead to node ID conflicts in attrd.

(cherry picked from commit 6af6da534646dbadf3d8d1d63d0edb2844c72073)
---
 crmd/lrm_state.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crmd/lrm_state.c b/crmd/lrm_state.c
index c03fa0b..bea1027 100644
--- a/crmd/lrm_state.c
+++ b/crmd/lrm_state.c
@@ -540,7 +540,6 @@ remote_proxy_cb(lrmd_t *lrmd, void *userdata, xmlNode *msg)
             if (safe_str_eq(type, T_ATTRD)
                 && crm_element_value(request, F_ATTRD_HOST) == NULL) {
                 crm_xml_add(request, F_ATTRD_HOST, proxy->node_name);
-                crm_xml_add_int(request, F_ATTRD_HOST_ID, get_local_nodeid(0));
             }
 
             rc = crm_ipc_send(proxy->ipc, request, flags, 5000, NULL);