From: Tim Bishop <tim@bishnet.net>
Date: Sun, 11 Feb 2018 12:35:47 +0000 (+0000)
Subject: cmake: rbd resource agent needs to be executable.
X-Git-Tag: v12.2.5~121^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03037efaa22a913a9fa574be9d8eb865ef7cb52e;p=ceph.git

cmake: rbd resource agent needs to be executable.

Without this the resource fails in Pacemaker with the error:

Feb 11 12:48:30 mypacemakerhost crmd[5154]:    error: Failed to retrieve meta-data for ocf:ceph:rbd
Feb 11 12:48:30 mypacemakerhost crmd[5154]:   notice: Operation p_rbd_myres_monitor_0: insufficient privileges (node=mypacemakerhost, call=228, rc=4, cib-update=60, confirmed=true)

This worked fine in the jewel version of the package, but is broken in
the luminous one, presumably because of the build changes.

Fixes: http://tracker.ceph.com/issues/22980
Signed-off-by: Tim Bishop <tim@bishnet.net>
(cherry picked from commit 567d15682ecaf873cf40d41ee8eaad28d6e59fa8)
---

diff --git a/src/ocf/CMakeLists.txt b/src/ocf/CMakeLists.txt
index 0ff0efcd96e3..9a87d02f1947 100644
--- a/src/ocf/CMakeLists.txt
+++ b/src/ocf/CMakeLists.txt
@@ -7,4 +7,4 @@ set(ocf_dir ${CMAKE_INSTALL_PREFIX}/lib/ocf)
 set(ra_dir ${ocf_dir}/resource.d/${PROJECT_NAME})
 
 configure_file(rbd.in rbd @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rbd DESTINATION ${ra_dir})
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/rbd DESTINATION ${ra_dir})