From: Ilya Dryomov Date: Sat, 14 Nov 2015 15:06:03 +0000 (+0100) Subject: rbd: recognize cephx_sign_messages option X-Git-Tag: v10.0.1~68^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6583%2Fhead;p=ceph.git rbd: recognize cephx_sign_messages option Signed-off-by: Ilya Dryomov --- diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index 826120fa1f2..6173b053acb 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -429,6 +429,10 @@ libceph (per client instance) options: * notcp_nodelay - Enable Nagle's algorithm on client sockets (since 4.0). +* cephx_sign_messages - Enable message signing (since 4.4, default). + +* nocephx_sign_messages - Disable message signing (since 4.4). + * mount_timeout=x - A timeout on various steps in `rbd map` and `rbd unmap` sequences (default is 60 seconds). In particular, since 4.2 this can be used to ensure that `rbd unmap` eventually times out when there is no network diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc index 5daa925bf3c..541da95c8b4 100644 --- a/src/tools/rbd/action/Kernel.cc +++ b/src/tools/rbd/action/Kernel.cc @@ -112,6 +112,9 @@ static int parse_map_options(char *options) } else if (!strcmp(this_char, "tcp_nodelay") || !strcmp(this_char, "notcp_nodelay")) { put_map_option("tcp_nodelay", this_char); + } else if (!strcmp(this_char, "cephx_sign_messages") || + !strcmp(this_char, "nocephx_sign_messages")) { + put_map_option("cephx_sign_messages", this_char); } else if (!strcmp(this_char, "mount_timeout")) { if (put_map_option_value("mount_timeout", value_char, map_option_int_cb)) return -EINVAL;