diff options
author | Sage Weil <sage@inktank.com> | 2013-05-01 14:02:37 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-05-01 14:02:37 -0700 |
commit | 771f4529b09e684564dcd828fed1d04f6e70a7cf (patch) | |
tree | f9f03a9f24845f4fd334910fa5ddf04013bced25 | |
parent | 7f99b46a49f1521555194f67517ed5deab2aaccf (diff) | |
download | ceph-771f4529b09e684564dcd828fed1d04f6e70a7cf.tar.gz |
doc/rados/deploy: misc edits
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | doc/rados/deployment/ceph-deploy-install.rst | 15 | ||||
-rw-r--r-- | doc/rados/deployment/ceph-deploy-mon.rst | 4 | ||||
-rw-r--r-- | doc/rados/deployment/ceph-deploy-new.rst | 13 | ||||
-rw-r--r-- | doc/rados/deployment/ceph-deploy-osd.rst | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/doc/rados/deployment/ceph-deploy-install.rst b/doc/rados/deployment/ceph-deploy-install.rst index abb79bd93ac..d84f790e526 100644 --- a/doc/rados/deployment/ceph-deploy-install.rst +++ b/doc/rados/deployment/ceph-deploy-install.rst @@ -20,9 +20,8 @@ you may select from the following: For example:: - ceph-deploy install --stable <code-name> <hostname1 [hostname2] ...> - ceph-deploy install --stable bobtail hostname{1,2,3,4,5} - ceph-deploy install --testing hostname1 + ceph-deploy install --stable cuttlefish hostname1 + ceph-deploy install --testing hostname2 ceph-deploy install --dev wip-some-branch hostname{1,2,3,4,5} For additional details, see `Installing Debian/Ubuntu Packages`_. @@ -34,13 +33,17 @@ For additional usage, execute:: Uninstall ========= -To uninstall Ceph packages from your cluster hosts, open a commandline on +To uninstall Ceph packages from your cluster hosts, open a terminal on your admin host and type the following:: ceph-deploy uninstall {hostname [hostname] ...} -The tool will unininstall ``ceph`` packages from the specified hosts. Other -commands may also invoke ``ceph-deploy uninstall``, such as ``purge``. +On a Debian or Ubuntu system, you may also:: + + ceph-deploy purge {hostname [hostname] ...} + +The tool will unininstall ``ceph`` packages from the specified hosts. Purge +additionally removes configuration files. .. _Installing Debian/Ubuntu Packages: ../../../install/debian diff --git a/doc/rados/deployment/ceph-deploy-mon.rst b/doc/rados/deployment/ceph-deploy-mon.rst index 75e3ed56413..217e0063109 100644 --- a/doc/rados/deployment/ceph-deploy-mon.rst +++ b/doc/rados/deployment/ceph-deploy-mon.rst @@ -8,7 +8,7 @@ add or remove one or more monitors on the command line with one command. Before numerous manual steps. Using ``ceph-deploy`` imposes a restriction: **you may only install one monitor per host.** -.. note:: We **DO NOT** recommend commingling monitors and OSDs on +.. note:: We do not recommend comingling monitors and OSDs on the same host. For high availability, you should run a production Ceph cluster with **AT @@ -50,4 +50,4 @@ the ``destroy`` option. :: .. _adding and removing monitors: ../../operations/add-or-rm-mons -.. _Monitor Config Reference: ../../configuration/mon-config-ref
\ No newline at end of file +.. _Monitor Config Reference: ../../configuration/mon-config-ref diff --git a/doc/rados/deployment/ceph-deploy-new.rst b/doc/rados/deployment/ceph-deploy-new.rst index c29f5390308..5681ca9be95 100644 --- a/doc/rados/deployment/ceph-deploy-new.rst +++ b/doc/rados/deployment/ceph-deploy-new.rst @@ -30,12 +30,13 @@ the host(s) that will be initial members of the monitor quorum. :: For example:: - ceph-deploy new ceph-mon1 - ceph-deploy new ceph-mon{1,2,3} + ceph-deploy new mon1.foo.com + ceph-deploy new mon{1,2,3} -The ``ceph-deploy`` utility will connect to each host to verify its hostname and -IP address. Then, it will add the specified host names to the Ceph configuration -file. For additional details, execute:: +The ``ceph-deploy`` utility will use DNS to resolve hostnames to IP +addresses. The monitors will be named using the first component of +the name (e.g., ``mon1'' above). It will add the specified host names +to the Ceph configuration file. For additional details, execute:: ceph-deploy new -h @@ -62,4 +63,4 @@ For example:: .. _Monitor Configuration Reference: ../../configuration/mon-config-ref -.. _Cephx Guide: ../../operations/authentication#monitor-keyrings
\ No newline at end of file +.. _Cephx Guide: ../../operations/authentication#monitor-keyrings diff --git a/doc/rados/deployment/ceph-deploy-osd.rst b/doc/rados/deployment/ceph-deploy-osd.rst index 4b201179c08..293d614f5f7 100644 --- a/doc/rados/deployment/ceph-deploy-osd.rst +++ b/doc/rados/deployment/ceph-deploy-osd.rst @@ -24,10 +24,6 @@ To list the disks on a host, execute the following command:: ceph-deploy disk list {host-name [host-name]...} -Or: - - ceph-disk-prepare list {host-name [host-name]...} - Zap Disks ========= |