import quincy beta 17.1.0

[ceph.git] / ceph / doc / cephadm / host-management.rst

diff --git a/ceph/doc/cephadm/host-management.rst b/ceph/doc/cephadm/host-management.rst
index c109e2dc73b322d49ca110c727ed9789a6ca2544..f342558fafcb74fcf841a51f36fb9c4cd4faa069 100644 (file)
--- a/ceph/doc/cephadm/host-management.rst
+++ b/ceph/doc/cephadm/host-management.rst
@@ -8,7 +8,13 @@ To list hosts associated with the cluster:
 
 .. prompt:: bash #
 
-    ceph orch host ls [--format yaml]
+    ceph orch host ls [--format yaml] [--host-pattern <name>] [--label <label>] [--host-status <status>]
+
+where the optional arguments "host-pattern", "label" and "host-status" are used for filtering.
+"host-pattern" is a regex that will match against hostnames and will only return matching hosts
+"label" will only return hosts with the given label
+"host-status" will only return hosts with the given status (currently "offline" or "maintenance")
+Any combination of these filtering flags is valid. You may filter against name, label and/or status simultaneously
 
 .. _cephadm-adding-hosts:    
     
@@ -82,7 +88,7 @@ All osds on the host will be scheduled to be removed. You can check osd removal
 
 see :ref:`cephadm-osd-removal` for more details about osd removal
 
-You can check if there are no deamons left on the host with the following:
+You can check if there are no daemons left on the host with the following:
 
 .. prompt:: bash #
 
@@ -163,7 +169,7 @@ Maintenance Mode
 Place a host in and out of maintenance mode (stops all Ceph daemons on host)::
 
     ceph orch host maintenance enter <hostname> [--force]
-    ceph orch host maintenace exit <hostname>
+    ceph orch host maintenance exit <hostname>
 
 Where the force flag when entering maintenance allows the user to bypass warnings (but not alerts)
 
@@ -202,7 +208,7 @@ Setting the initial CRUSH location of host
 ==========================================
 
 Hosts can contain a ``location`` identifier which will instruct cephadm to 
-create a new CRUSH host located in the specified hierachy.
+create a new CRUSH host located in the specified hierarchy.
 
 .. code-block:: yaml
 
@@ -218,6 +224,8 @@ create a new CRUSH host located in the specified hierachy.
   changes of the ``location`` property will be ignored. Also, removing a host will no remove
   any CRUSH buckets.
 
+See also :ref:`crush_map_default_types`.
+
 SSH Configuration
 =================