ceph-disk: fsid is a known configuration option

Use get_conf_with_default instead of get_conf because fsid is a known
ceph configuration option. It allows overriding via CEPH_ARGS which is
convenient for testing. Only options that are not found in config_opts.h
are fetch via get_conf.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/ceph-disk b/src/ceph-disk
index fef157627db08b0dbe99ccbd59d41cb97c249ec4..8101f31575efaaa37e9de7304b14dd51dad5c30b 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -653,7 +653,7 @@ def get_fsid(cluster):
 
     :return: The fsid or raises Error.
     """
-    fsid = get_conf(cluster=cluster, variable='fsid')
+    fsid = get_conf_with_default(cluster=cluster, variable='fsid')
     if fsid is None:
         raise Error('getting cluster uuid from configuration failed')
     return fsid.lower()