doc: document new hadoop config options

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/doc/cephfs/hadoop.rst b/doc/cephfs/hadoop.rst
index d1ece6bbec68d1663c6b392a4bc4978f29ce7d6d..8c29376269ec884fcb65c5897d2b36c73a102484 100644 (file)
--- 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                    |
 |                     |                          |                            |