From: Loic Dachary <loic@dachary.org>
Date: Wed, 1 Jan 2014 21:07:57 +0000 (+0100)
Subject: ceph-disk: fsid is a known configuration option
X-Git-Tag: v0.67.6~1^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3aae5b764c5698c665a708a3f6f2243dfee1a28d;p=ceph.git

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 b7098ed97b2..d995dbcedbb 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()