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>
(cherry picked from commit b65eb377f5e93ea85644e4c0939365fd7ac36072)

diff --git a/src/ceph-disk b/src/ceph-disk
index b7098ed97b2dd49cf3923df4c4bc4bd0cdc32784..d995dbcedbbc14ae1bcc59efcee5963ea72d6d29 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()