doc/install: new URLs for argonaut vs bobtail

Also restructure the document a bit to make the choice of packages more
clear.

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

diff --git a/doc/install/debian.rst b/doc/install/debian.rst
index 8f41bc12c900bcf50f797ab882299e6c8d58b69d..d6565df0001694fc51899bd6cb6b88cab2a925d8 100644 (file)
--- a/doc/install/debian.rst
+++ b/doc/install/debian.rst
@@ -7,11 +7,8 @@ development release packages (for the latest features), or development
 testing packages (for development and QA only).  Do not add multiple
 package sources at the same time.
 
-Add Stable Release Packages
-===========================
-
-We build Debian and Ubuntu packages for each stable release of Ceph.  These
-packages are recommended for anyone deploying Ceph in a production environment.
+Install Release Key
+===================
 
 Packages are cryptographically signed with the ``release.asc`` key.
 Add our release key to your system's list of trusted keys to avoid a
@@ -19,32 +16,55 @@ security warning::
 
        wget -q -O- https://raw.github.com/ceph/ceph/master/keys/release.asc | sudo apt-key add -
 
+Add Release Packages
+====================
+
+Bobtail
+-------
+
+Bobtail 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 Debian repository`_ for a complete list of distributions 
+See `the bobtail Debian repository`_ for a complete list of distributions
 supported. ::
 
-       echo deb http://ceph.com/debian/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
+       echo deb http://ceph.com/debian-bobtail/ $(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/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
+       echo deb http://eu.ceph.com/debian-bobtail/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
 
-Add Development Release Packages
-================================
+Argonaut
+--------
 
-Our development process generates a new release of Ceph every 3-4 weeks.
-These packages are faster-moving than the stable releases, as they get
-new features integrated quickly, while still undergoing several weeks of QA
-prior to release.
+Argonaut is the previous major release of Ceph.  These packages are
+recommended for those who have already deployed argonaut in production
+and are not yet ready to upgrade.
 
-Packages are cryptographically signed with the ``release.asc`` key.
-Add our release key to your system's list of trusted keys to avoid a
-security warning::
+Add our package repository to your system's list of APT sources.  See
+`the argonaut Debian repository`_ for a complete list of distributions
+supported. ::
 
-       wget -q -O- https://raw.github.com/ceph/ceph/master/keys/release.asc | sudo apt-key add -
+       echo deb http://ceph.com/debian-argonaut/ $(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-argonaut/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
+ 
 
-Add our package repository to your system's list of APT sources.
-See `the Debian repository`_ for a complete list of distributions
+Development Release Packages
+----------------------------
+
+Our development process generates a new release of Ceph every 3-4
+weeks.  These packages are faster-moving than the stable releases, as
+they get new features integrated quickly, while still undergoing
+several weeks of QA prior to release.
+
+Add our package repository to your system's list of APT sources.  See
+`the testing Debian repository`_ for a complete list of distributions
 supported. ::
 
        echo deb http://ceph.com/debian-testing/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
@@ -53,8 +73,9 @@ For the European users there is also a mirror in the Netherlands at http://eu.ce
 
        echo deb http://eu.ceph.com/debian-testing/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
 
-Add Development Testing Packages
-================================
+
+Development Testing Packages
+----------------------------
 
 We automatically build Debian and Ubuntu packages for current
 development branches in the Ceph source code repository.  These
@@ -66,12 +87,14 @@ security warning::
 
        wget -q -O- https://raw.github.com/ceph/ceph/master/keys/autobuild.asc | sudo apt-key add -
 
-Add our package repository to your system's list of APT sources, but replace ``{BRANCH}`` 
-with the branch you'd like to use (e.g., chef-3, wip-hack, master, stable).
-We support ``oneiric`` and ``precise`` distributions. ::
+Add our package repository to your system's list of APT sources, but
+replace ``{BRANCH}`` with the branch you'd like to use (e.g., chef-3,
+wip-hack, master, stable).  See `the gitbuilder page`_ for a complete
+list of distributions we build. ::
 
        echo deb http://gitbuilder.ceph.com/ceph-deb-$(lsb_release -sc)-x86_64-basic/ref/{BRANCH} $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
 
+
 Installing Packages
 ===================
 
@@ -81,4 +104,7 @@ you should update APT's database and install Ceph::
        sudo apt-get update && sudo apt-get install ceph
 
 
-.. _the Debian repository: http://ceph.com/debian/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
+.. _the gitbuidler page: http://gitbuilder.ceph.com
\ No newline at end of file

diff --git a/doc/install/rpm.rst b/doc/install/rpm.rst
index b23adea1e99381b92931178a212b440299eee91a..b83fe5fd66a25fa83d54eede72be0958efc47c5c 100644 (file)
--- a/doc/install/rpm.rst
+++ b/doc/install/rpm.rst
@@ -7,14 +7,44 @@ development release packages (for the latest features), or development
 testing packages (for development and QA only).  Do not add multiple
 package sources at the same time.
 
-Add Stable Release Packages
-===========================
+Install Release Key
+===================
+
+Packages are cryptographically signed with the ``release.asc`` key. Add our
+release key to your system's list of trusted keys to avoid a security warning::
+
+    sudo rpm --import https://raw.github.com/ceph/ceph/master/keys/release.asc
+
+Add Release Packages
+====================
+
+Bobtail
+-------
+
+Bobtail 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.
 
-RPM packages have not been built for the current stable releases, but
-are planned for the future.
+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``.
 
-Add Development Release Packages
-================================
+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'
+
+For example, for CentOS 6 or other RHEL6 derivatives (``el6``)::
+
+    su -c 'rpm -Uvh http://ceph.com/rpm-bobtail/el6/x86_64/ceph-release-1-0.el6.noarch.rpm'
+
+You can download the RPMs directly from::
+
+     http://ceph.com/rpm-bobtail
+
+
+Development Release Packages
+----------------------------
 
 Our development process generates a new release of Ceph every 3-4 weeks. These
 packages are faster-moving than the stable releases. Development packages have
@@ -38,6 +68,10 @@ For Fedora 17::
 
     su -c 'rpm -Uvh http://ceph.com/rpms/fc17/x86_64/ceph-release-1-0.fc17.noarch.rpm'
 
+You can download the RPMs directly from::
+
+     http://ceph.com/rpm-testing
+
 Installing Packages
 ===================