From: Noah Watkins Date: Sun, 17 Mar 2013 19:10:16 +0000 (-0700) Subject: doc: document new hadoop config options X-Git-Tag: v0.67-rc1~81^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a805958f89497f91f00828ae51796ea9348ca954;p=ceph.git doc: document new hadoop config options Signed-off-by: Noah Watkins --- diff --git a/doc/cephfs/hadoop.rst b/doc/cephfs/hadoop.rst index d1ece6bbec68..8c29376269ec 100644 --- a/doc/cephfs/hadoop.rst +++ b/doc/cephfs/hadoop.rst @@ -57,7 +57,7 @@ These options are intended to be set in the Hadoop configuration file |Property |Value |Notes | | | | | +=====================+==========================+============================+ -|fs.default.name |Ceph URI |ceph:/// | +|fs.default.name |Ceph URI |ceph://[monaddr:port][/root]| | | | | | | | | +---------------------+--------------------------+----------------------------+ @@ -75,6 +75,26 @@ These options are intended to be set in the Hadoop configuration file | | | | | | | | +---------------------+--------------------------+----------------------------+ +|ceph.mon.address |Monitor address |host:port | +| | | | +| | | | +| | | | ++---------------------+--------------------------+----------------------------+ +|ceph.auth.id |Ceph user id |Example: admin | +| | | | +| | | | +| | | | ++---------------------+--------------------------+----------------------------+ +|ceph.auth.keyfile |Ceph key file | | +| | | | +| | | | +| | | | ++---------------------+--------------------------+----------------------------+ +|ceph.auth.keyring |Ceph keyring file | | +| | | | +| | | | +| | | | ++---------------------+--------------------------+----------------------------+ |ceph.object.size |Default file object size |Default value (64MB): | | |in bytes |67108864 | | | | |