doc/config-cluster/chef.rst <-fixed an error in upload command.

doc/config-cluster/deploying-ceph-conf.rst <-added sudo. required.
doc/config-cluster/deploying-ceph-with-mkcephfs.rst <-cd to /etc/ceph so keyring goes there.
doc/install/chef.rst <-added update and install opscode-keyring, and upgrade.
doc/install/debian.rst <-added ceph-common to the install

Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>

diff --git a/doc/config-cluster/chef.rst b/doc/config-cluster/chef.rst
index b204af0a13f07cf70d1f794616790aa36cb2d93b..f2162863281f3e9914cd807285b9c77fecfa4e3f 100644 (file)
--- a/doc/config-cluster/chef.rst
+++ b/doc/config-cluster/chef.rst
@@ -18,7 +18,7 @@ To get the cookbooks for Ceph, clone them from git.::
 
        cd ~/.chef      
        git clone https://github.com/ceph/ceph-cookbooks.git
-       knife cookbook site upload parted btrfs parted
+       knife cookbook upload parted btrfs ceph
 
 Install Apache Cookbooks
 ------------------------

diff --git a/doc/config-cluster/deploying-ceph-conf.rst b/doc/config-cluster/deploying-ceph-conf.rst
index be9258f0bb5a79cc6c452f3a5a022a7c97240b9a..c5bc485e1f1fb02302a78eb57ef9ccb35b3e4059 100644 (file)
--- a/doc/config-cluster/deploying-ceph-conf.rst
+++ b/doc/config-cluster/deploying-ceph-conf.rst
@@ -19,21 +19,21 @@ server directories for each instance of a Ceph daemon. Using the exemplary
 
 On ``myserver01``::
 
-       mkdir srv/osd.0
-       mkdir srv/mon.a
+       sudo mkdir srv/osd.0
+       sudo mkdir srv/mon.a
 
 On ``myserver02``::
 
-       mkdir srv/osd.1
-       mkdir srv/mon.b
+       sudo mkdir srv/osd.1
+       sudo mkdir srv/mon.b
 
 On ``myserver03``::
 
-       mkdir srv/osd.2
-       mkdir srv/mon.c
+       sudo mkdir srv/osd.2
+       sudo mkdir srv/mon.c
 
 On ``myserver04``::
 
-       mkdir srv/osd.3
+       sudo mkdir srv/osd.3
 
 .. important:: The ``host`` variable determines which host runs each instance of a Ceph daemon.

diff --git a/doc/config-cluster/deploying-ceph-with-mkcephfs.rst b/doc/config-cluster/deploying-ceph-with-mkcephfs.rst
index d428f4369b4ef3cff9939e3fd7b05960ae702970..3a14fabeacdf9179279745ac6dbdb9592c01e660 100644 (file)
--- a/doc/config-cluster/deploying-ceph-with-mkcephfs.rst
+++ b/doc/config-cluster/deploying-ceph-with-mkcephfs.rst
@@ -11,6 +11,7 @@ you may deploy Ceph with the ``mkcephfs`` script.
 For production environments, you deploy Ceph using Chef cookbooks. To run 
 ``mkcephfs``, execute the following:: 
 
+   cd /etc/ceph
    sudo mkcephfs -a -c /etc/ceph/ceph.conf -k ceph.keyring
        
 The script adds an admin key to the ``ceph.keyring``, which is analogous to a 

diff --git a/doc/install/chef.rst b/doc/install/chef.rst
index 0af291ebe6fedc4024d33c2c9d9ff9608aebebe3..5e3019b92c90a30004c083c73ac4bf4b95990f48 100644 (file)
--- a/doc/install/chef.rst
+++ b/doc/install/chef.rst
@@ -50,9 +50,12 @@ Next, you must request keys so that APT can verify the packages. ::
 
        gpg --keyserver keys.gnupg.net --recv-keys 83EF826A
        gpg --export packages@opscode.com | sudo apt-key add -
+       sudo apt-get update
+       sudo apt-get install opscode-keyring
 
 To install Chef, execute ``update`` and ``install``. For example::
 
+       sudo apt-get upgrade
        sudo apt-get update
        sudo apt-get install chef
 

diff --git a/doc/install/debian.rst b/doc/install/debian.rst
index 3dffc7c6ed83bc1f2c8e4cfe7639e3c5e329a6e4..7087b7c13be73b21f40bf14ef304341a3dff7c19 100644 (file)
--- a/doc/install/debian.rst
+++ b/doc/install/debian.rst
@@ -26,4 +26,5 @@ Update APT's database::
 Install Ceph::
 
         sudo apt-get install ceph
+       sudo apt-get install ceph-common