Merge lp:~evilnick/charms/precise/ceph/readme-edits into lp:~charmers/charms/precise/ceph/trunk

Proposed by Nick Veitch
Status: Merged
Merged at revision: 63
Proposed branch: lp:~evilnick/charms/precise/ceph/readme-edits
Merge into: lp:~charmers/charms/precise/ceph/trunk
Diff against target: 44 lines (+10/-10)
1 file modified
README.md (+10/-10)
To merge this branch: bzr merge lp:~evilnick/charms/precise/ceph/readme-edits
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+175360@code.launchpad.net

Description of the change

Just fixed some formatting, grammar and spelling bits in the README that I noticed whilst browsing on the Charm store.

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2013-06-24 09:15:45 +0000
3+++ README.md 2013-07-17 18:19:45 +0000
4@@ -24,11 +24,11 @@
5 ceph-authtool /dev/stdout --name=mon. --gen-key
6
7 These two pieces of configuration must NOT be changed post bootstrap; attempting
8-todo this will cause a reconfiguration error and new service units will not join
9+to do this will cause a reconfiguration error and new service units will not join
10 the existing ceph cluster.
11
12-The charm also supports specification of the storage devices to use in the ceph
13-cluster.
14+The charm also supports the specification of storage devices to be used in the
15+ceph cluster.
16
17 osd-devices:
18 A list of devices that the charm will attempt to detect, initialise and
19@@ -72,18 +72,18 @@
20
21 This charm uses the new-style Ceph deployment as reverse-engineered from the
22 Chef cookbook at https://github.com/ceph/ceph-cookbooks, although we selected
23-a different strategy to form the monitor cluster. Since we don't know the
24-names *or* addresses of the machines in advance, we use the relation-joined
25+a different strategy to form the monitor cluster. Since we don't know the
26+names *or* addresses of the machines in advance, we use the _relation-joined_
27 hook to wait for all three nodes to come up, and then write their addresses
28 to ceph.conf in the "mon host" parameter. After we initialize the monitor
29 cluster a quorum forms quickly, and OSD bringup proceeds.
30
31-The osds use so-called "OSD hotplugging". ceph-disk-prepare is used to create
32-the filesystems with a special GPT partition type. udev is set up to mounti
33-such filesystems and start the osd daemons as their storage becomes visible to
34-the system (or after "udevadm trigger").
35+The osds use so-called "OSD hotplugging". **ceph-disk-prepare** is used to
36+create the filesystems with a special GPT partition type. *udev* is set up
37+to mount such filesystems and start the osd daemons as their storage becomes
38+visible to the system (or after "udevadm trigger").
39
40-The Chef cookbook above performs some extra steps to generate an OSD
41+The Chef cookbook mentioned above performs some extra steps to generate an OSD
42 bootstrapping key and propagate it to the other nodes in the cluster. Since
43 all OSDs run on nodes that also run mon, we don't need this and did not
44 implement it.

Subscribers

People subscribed via source and target branches

to all changes: