doc/install/{debian,rpm}: update for cuttlefish

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/doc/install/debian.rst b/doc/install/debian.rst
index 345eb2093b419c94199b08506b715784c10c6476..e2ff582532cdce427781d1102300f5dd91ead02f 100644 (file)
--- a/doc/install/debian.rst
+++ b/doc/install/debian.rst
@@ -19,14 +19,32 @@ security warning::
 Add Release Packages
 ====================
 
-Bobtail
--------
+Cuttlefish
+----------
 
-Bobtail is the most recent major release of Ceph. These packages are
+Cuttlefish is the most recent major release of Ceph. These packages are
 recommended for anyone deploying Ceph in a production environment.
 Critical bug fixes are backported and point releases are made as
 necessary.
 
+Add our package repository to your system's list of APT sources.  
+See `the cuttlefish Debian repository`_ for a complete list of Debian and Ubuntu releases
+supported. ::
+
+       echo deb http://ceph.com/debian-cuttlefish/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
+
+For the European users there is also a mirror in the Netherlands at http://eu.ceph.com/ ::
+
+       echo deb http://eu.ceph.com/debian-cuttlefish/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
+
+
+Bobtail
+-------
+
+Bobtail is the previous major release of Ceph. These packages are
+recommended for those who have already deployed bobtail in production and
+are not yet ready to upgrade.
+
 Add our package repository to your system's list of APT sources.  
 See `the bobtail Debian repository`_ for a complete list of Debian and Ubuntu releases
 supported. ::
@@ -40,7 +58,7 @@ For the European users there is also a mirror in the Netherlands at http://eu.ce
 Argonaut
 --------
 
-Argonaut is the previous major release of Ceph.  These packages are
+Argonaut is the first major release of Ceph.  These packages are
 recommended for those who have already deployed argonaut in production
 and are not yet ready to upgrade.
 
@@ -104,6 +122,7 @@ you should update APT's database and install Ceph::
        sudo apt-get update && sudo apt-get install ceph
 
 
+.. _the cuttlefish Debian repository: http://ceph.com/debian-cuttlefish/dists
 .. _the bobtail Debian repository: http://ceph.com/debian-bobtail/dists
 .. _the argonaut Debian repository: http://ceph.com/debian-argonaut/dists
 .. _the testing Debian repository: http://ceph.com/debian-testing/dists

diff --git a/doc/install/rpm.rst b/doc/install/rpm.rst
index 386e39ec73a3a258d07735cf0e6777625a62848c..3089a20c852da3f8d41c2260cce3ec99fa07d930 100644 (file)
--- a/doc/install/rpm.rst
+++ b/doc/install/rpm.rst
@@ -19,10 +19,10 @@ release key to your system's list of trusted keys to avoid a security warning::
 Add Release Packages
 ====================
 
-Bobtail
--------
+Cuttlefish
+----------
 
-Bobtail is the most recent major release of Ceph.  These packages are
+Cuttlefish is the most recent stable release of Ceph.  These packages are
 recommended for anyone deploying Ceph in a production environment.
 Critical bug fixes are backported and point releases are made as necessary.
 
@@ -31,6 +31,31 @@ Packages are currently built for the RHEL/CentOS6 (``el6``), Fedora 17
 platforms. The repository package installs the repository details on
 your local system for use with ``yum`` or ``up2date``.
 
+Replase the``{DISTRO}`` below with the distro codename::
+
+    su -c 'rpm -Uvh http://ceph.com/rpm-cuttlefish/{DISTRO}/x86_64/ceph-release-1-0.el6.noarch.rpm'
+
+For example, for CentOS 6 or other RHEL6 derivatives (``el6``)::
+
+    su -c 'rpm -Uvh http://ceph.com/rpm-cuttlefish/el6/x86_64/ceph-release-1-0.el6.noarch.rpm'
+
+You can download the RPMs directly from::
+
+     http://ceph.com/rpm-cuttlefish
+
+
+Bobtail
+-------
+
+Bobtail is the previous recent major release of Ceph.  These packages are
+recommended for those who have already deployed bobtail in production and
+are not yet ready to upgrade.
+
+Packages are currently built for the RHEL/CentOS6 (``el6``), Fedora 17
+(``f17``), OpenSUSE 12 (``opensuse12``), and SLES (``sles11``)
+platforms. The repository package installs the repository details on
+your local system for use with ``yum`` or ``up2date``.
+
 Replase the``{DISTRO}`` below with the distro codename::
 
     su -c 'rpm -Uvh http://ceph.com/rpm-bobtail/{DISTRO}/x86_64/ceph-release-1-0.el6.noarch.rpm'