From ff64818f1c3b3c2d0cd45908fa47e546c8ed7efa Mon Sep 17 00:00:00 2001 From: John Wilkins Date: Tue, 22 May 2012 17:10:43 -0700 Subject: [PATCH] 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 --- doc/config-cluster/chef.rst | 2 +- doc/config-cluster/deploying-ceph-conf.rst | 14 +++++++------- .../deploying-ceph-with-mkcephfs.rst | 1 + doc/install/chef.rst | 3 +++ doc/install/debian.rst | 1 + 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/config-cluster/chef.rst b/doc/config-cluster/chef.rst index b204af0a13f07..f2162863281f3 100644 --- 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 be9258f0bb5a7..c5bc485e1f1fb 100644 --- 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 d428f4369b4ef..3a14fabeacdf9 100644 --- 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 0af291ebe6fed..5e3019b92c90a 100644 --- 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 3dffc7c6ed83b..7087b7c13be73 100644 --- 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 -- 2.39.5