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
=== modified file 'README.md'
--- README.md 2013-06-24 09:15:45 +0000
+++ README.md 2013-07-17 18:19:45 +0000
@@ -24,11 +24,11 @@
24 ceph-authtool /dev/stdout --name=mon. --gen-key24 ceph-authtool /dev/stdout --name=mon. --gen-key
2525
26These two pieces of configuration must NOT be changed post bootstrap; attempting26These two pieces of configuration must NOT be changed post bootstrap; attempting
27todo this will cause a reconfiguration error and new service units will not join27to do this will cause a reconfiguration error and new service units will not join
28the existing ceph cluster.28the existing ceph cluster.
2929
30The charm also supports specification of the storage devices to use in the ceph30The charm also supports the specification of storage devices to be used in the
31cluster.31ceph cluster.
3232
33 osd-devices:33 osd-devices:
34 A list of devices that the charm will attempt to detect, initialise and34 A list of devices that the charm will attempt to detect, initialise and
@@ -72,18 +72,18 @@
7272
73This charm uses the new-style Ceph deployment as reverse-engineered from the73This charm uses the new-style Ceph deployment as reverse-engineered from the
74Chef cookbook at https://github.com/ceph/ceph-cookbooks, although we selected74Chef cookbook at https://github.com/ceph/ceph-cookbooks, although we selected
75a different strategy to form the monitor cluster. Since we don't know the75a different strategy to form the monitor cluster. Since we don't know the
76names *or* addresses of the machines in advance, we use the relation-joined76names *or* addresses of the machines in advance, we use the _relation-joined_
77hook to wait for all three nodes to come up, and then write their addresses77hook to wait for all three nodes to come up, and then write their addresses
78to ceph.conf in the "mon host" parameter. After we initialize the monitor78to ceph.conf in the "mon host" parameter. After we initialize the monitor
79cluster a quorum forms quickly, and OSD bringup proceeds.79cluster a quorum forms quickly, and OSD bringup proceeds.
8080
81The osds use so-called "OSD hotplugging". ceph-disk-prepare is used to create81The osds use so-called "OSD hotplugging". **ceph-disk-prepare** is used to
82the filesystems with a special GPT partition type. udev is set up to mounti82create the filesystems with a special GPT partition type. *udev* is set up
83such filesystems and start the osd daemons as their storage becomes visible to83to mount such filesystems and start the osd daemons as their storage becomes
84the system (or after "udevadm trigger").84visible to the system (or after "udevadm trigger").
8585
86The Chef cookbook above performs some extra steps to generate an OSD86The Chef cookbook mentioned above performs some extra steps to generate an OSD
87bootstrapping key and propagate it to the other nodes in the cluster. Since87bootstrapping key and propagate it to the other nodes in the cluster. Since
88all OSDs run on nodes that also run mon, we don't need this and did not88all OSDs run on nodes that also run mon, we don't need this and did not
89implement it.89implement it.

Subscribers

People subscribed via source and target branches

to all changes: