From b65eb377f5e93ea85644e4c0939365fd7ac36072 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 1 Jan 2014 22:07:57 +0100 Subject: [PATCH] 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 --- src/ceph-disk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-disk b/src/ceph-disk index fef157627db08..8101f31575efa 100755 --- 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() -- 2.39.5