summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@dreamhost.com>2012-05-22 09:53:34 -0700
committerJohn Wilkins <john.wilkins@dreamhost.com>2012-05-22 09:53:34 -0700
commitb0d6895a21dcf634a15156884c0f1316ced12037 (patch)
tree438a37db9695949379622558c13ba3ce57ba886f /doc
parente3b3108bfd70d45bc635186975a154f878a19096 (diff)
downloadceph-b0d6895a21dcf634a15156884c0f1316ced12037.tar.gz
doc/config-cluster/ceph-conf.rst <-Fixed some formatting issues.
doc/config-cluster/deploying-ceph-conf.rst <-minor edit. doc/start/get-involved-in-the-ceph-community.rst <-removed $ from command line instruction. doc/start/quick-start.rst <-added additional steps. Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/config-cluster/ceph-conf.rst12
-rw-r--r--doc/config-cluster/deploying-ceph-conf.rst6
-rw-r--r--doc/start/get-involved-in-the-ceph-community.rst2
-rw-r--r--doc/start/quick-start.rst19
4 files changed, 25 insertions, 14 deletions
diff --git a/doc/config-cluster/ceph-conf.rst b/doc/config-cluster/ceph-conf.rst
index e1237a66a7b..83dd6082bb5 100644
--- a/doc/config-cluster/ceph-conf.rst
+++ b/doc/config-cluster/ceph-conf.rst
@@ -13,13 +13,13 @@ Each process or daemon looks for a ``ceph.conf`` file that provides their
configuration settings. The default ``ceph.conf`` locations in sequential
order include:
-#. ``$CEPH_CONF`` (*i.e.,* the path following
-the ``$CEPH_CONF`` environment variable)
+#. ``$CEPH_CONF`` (*i.e.,* the path following the ``$CEPH_CONF`` environment variable)
#. ``-c path/path`` (*i.e.,* the ``-c`` command line argument)
#. ``/etc/ceph/ceph.conf``
#. ``~/.ceph/config``
#. ``./ceph.conf`` (*i.e.,* in the current working directory)
+
The ``ceph.conf`` file provides the settings for each Ceph daemon. Once you
have installed the Ceph packages on the OSD Cluster hosts, you need to create
a ``ceph.conf`` file to configure your OSD cluster.
@@ -124,7 +124,7 @@ alphanumeric for monitors and metadata servers. ::
``host`` and ``addr`` Settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `Hardware Recommendations <../hardware-recommendations>`_ section
+The `Hardware Recommendations <../../install/hardware-recommendations>`_ section
provides some hardware guidelines for configuring the cluster. It is possible
for a single host to run multiple daemons. For example, a single host with
multiple disks or RAIDs may run one ``ceph-osd`` for each disk or RAID.
@@ -153,7 +153,7 @@ algorithm can determine which version of the cluster map is the most accurate.
.. note:: You may deploy Ceph with a single monitor, but if the instance fails,
the lack of a monitor may interrupt data service availability.
-Ceph monitors typically listen on port ``6789``. For example:
+Ceph monitors typically listen on port ``6789``. For example::
[mon.a]
host = hostNumber1
@@ -173,9 +173,9 @@ all hosts share the same configuration file.
You may create a ``ceph.conf`` file for each host if you wish, or specify a
particular ``ceph.conf`` file for a subset of hosts within the cluster. However,
-using per-host ``ceph.conf``configuration files imposes a maintenance burden as the
+using per-host ``ceph.conf`` configuration files imposes a maintenance burden as the
cluster grows. In a typical deployment, an administrator creates a ``ceph.conf`` file
on the Administration host and then copies that file to each OSD Cluster host.
The current cluster deployment script, ``mkcephfs``, does not make copies of the
-``ceph.conf``. You must copy the file manually. \ No newline at end of file
+``ceph.conf``. You must copy the file manually.
diff --git a/doc/config-cluster/deploying-ceph-conf.rst b/doc/config-cluster/deploying-ceph-conf.rst
index 30259b11633..be9258f0bb5 100644
--- a/doc/config-cluster/deploying-ceph-conf.rst
+++ b/doc/config-cluster/deploying-ceph-conf.rst
@@ -1,6 +1,6 @@
-==============================
- Deploying Ceph Configuration
-==============================
+==================================
+ Deploying the Ceph Configuration
+==================================
Ceph's ``mkcephfs`` deployment script does not copy the configuration file you
created from the Administration host to the OSD Cluster hosts. Copy the
configuration file you created (*i.e.,* ``mycluster.conf`` in the example below)
diff --git a/doc/start/get-involved-in-the-ceph-community.rst b/doc/start/get-involved-in-the-ceph-community.rst
index 77beb35d159..58af4a8f586 100644
--- a/doc/start/get-involved-in-the-ceph-community.rst
+++ b/doc/start/get-involved-in-the-ceph-community.rst
@@ -28,7 +28,7 @@ These are exciting times in the Ceph community! Get involved!
+-----------------+-------------------------------------------------+-----------------------------------------------+
| **Source Code** | If you would like to participate in | |
| | development, bug fixing, or if you just want | - http://github.com:ceph/ceph.git |
-| | the very latest code for Ceph, you can get it | - ``$git clone git@github.com:ceph/ceph.git`` |
+| | the very latest code for Ceph, you can get it | - ``git clone git@github.com:ceph/ceph.git`` |
| | at http://github.com. | |
+-----------------+-------------------------------------------------+-----------------------------------------------+
| **Support** | If you have a very specific problem, an | http://inktank.com |
diff --git a/doc/start/quick-start.rst b/doc/start/quick-start.rst
index 4c5aed8b857..8ce6a7a2082 100644
--- a/doc/start/quick-start.rst
+++ b/doc/start/quick-start.rst
@@ -4,8 +4,19 @@
Ceph is intended for large-scale deployments, but you may install Ceph on a
single host. Quick start is intended for Debian/Ubuntu Linux distributions.
-#. `Install Ceph packages <../../install/debian>`_
+#. `Install Ceph packages`_
#. Create a ``ceph.conf`` file.
- See `Ceph Configuration Files <../../config-cluster/ceph-conf>`_ for details.
-#. Create and start a Ceph cluster.
- See `Deploying Ceph with mkcephfs <../../config-cluster/deploying-ceph-with-mkcephfs>`_
+ See `Ceph Configuration Files`_ for details.
+#. Deploy the Ceph configuration.
+ See `Deploying the Ceph Configuration`_ for details.
+#. Configure a Ceph cluster
+ See `Deploying Ceph with mkcephfs`_ for details.
+#. Start a Ceph cluster.
+ See `Starting a Cluster`_ for details.
+
+
+.. _Install Ceph packages: ../../install/debian
+.. _Ceph Configuration Files: ../../config-cluster/ceph-conf
+.. _Deploying the Ceph Configuration: ../../config-cluster/deploying-ceph-conf
+.. _Deploying Ceph with mkcephfs: ../../config-cluster/deploying-ceph-with-mkcephfs
+.. _Starting a Cluster: ../../init/start-cluster/