From 54a728ff11f7dab4a9526af7ab8d4135fc510d98 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Fri, 22 Feb 2019 10:13:51 -0500 Subject: Update help text for rbd_ceph_conf Follow up to I49b4c680d9bfc36a98ad8c85775d213e9fbf4e60 Change-Id: I1669b43aa7cfac5802d85668218329f39ff9ebe8 --- glance_store/_drivers/rbd.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'glance_store') diff --git a/glance_store/_drivers/rbd.py b/glance_store/_drivers/rbd.py index df2bb3e..404fe90 100644 --- a/glance_store/_drivers/rbd.py +++ b/glance_store/_drivers/rbd.py @@ -112,12 +112,19 @@ Related options: help=""" Ceph configuration file path. -This configuration option takes in the path to the Ceph configuration +This configuration option specifies the path to the Ceph configuration file to be used. If the value for this option is not set by the user -or is set to None, librados will locate the default configuration file -which is located at /etc/ceph/ceph.conf. If using Cephx -authentication, this file should include a reference to the right -keyring in a client. section +or is set to the empty string, librados will read the standard ceph.conf +file by searching the default Ceph configuration file locations in +sequential order. See the Ceph documentation for details. + +NOTE: If using Cephx authentication, this file should include a reference +to the right keyring in a client. section + +NOTE 2: If you leave this option empty (the default), the actual Ceph +configuration file used may change depending on what version of librados +is being used. If it is important for you to know exactly which configuration +file is in effect, you may specify that file here using this option. Possible Values: * A valid path to a configuration file -- cgit v1.2.1