summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-10-10 12:21:34 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2013-10-10 12:21:34 -0700
commit5bc63276664b3402520f389d48d0753c1d5f26c1 (patch)
treeb51b712bebae78856d631ce5ef714c613424966a
parentc0c332c120518991c2ea83bd8eabceaec2c19e26 (diff)
downloadceph-5bc63276664b3402520f389d48d0753c1d5f26c1.tar.gz
doc: Merge cleanup.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/start/quick-start-preflight.rst14
1 files changed, 4 insertions, 10 deletions
diff --git a/doc/start/quick-start-preflight.rst b/doc/start/quick-start-preflight.rst
index 1f444ccbfb3..77a54795f19 100644
--- a/doc/start/quick-start-preflight.rst
+++ b/doc/start/quick-start-preflight.rst
@@ -29,10 +29,6 @@ three Ceph Nodes (or virtual machines) that will host your Ceph Storage Cluster.
| cCCC |
\----------------/
-Before you can deploy Ceph using ``ceph-deploy``, you need to ensure that you
-have a few things set up first on your admin node and on nodes running Ceph
-daemons.
-
Ceph Node Setup
===============
@@ -91,6 +87,10 @@ Ceph Deploy Setup
Add Ceph repositories to the ``ceph-deploy`` admin node. Then, install
``ceph-deploy``.
+.. important:: Do not call ``ceph-deploy`` with ``sudo`` or run it as ``root``
+ if you are logged in as a different user, because it will not issue ``sudo``
+ commands needed on the remote host.
+
Advanced Package Tool (APT)
---------------------------
@@ -114,8 +114,6 @@ For Debian and Ubuntu distributions, perform the following steps:
sudo apt-get update && sudo apt-get install ceph-deploy
-.. tip:: The ``ceph-deploy`` tool is new and you may encounter some issues
- without effective error messages.
Red Hat Package Manager (RPM)
-----------------------------
@@ -123,9 +121,6 @@ Red Hat Package Manager (RPM)
For Red Hat(rhel6), CentOS (el6), Fedora 17-19 (f17-f19), OpenSUSE 12
(opensuse12), and SLES (sles11) perform the following steps:
-Hostname Resolution
-===================
-
#. Add the package to your repository. Open a text editor and create a
Yellowdog Updater, Modified (YUM) entry. Use the file path
``/etc/yum.repos.d/ceph.repo``. For example::
@@ -147,7 +142,6 @@ Hostname Resolution
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
- {ip-address} {hostname}
#. Update your repository and install ``ceph-deploy``::