Merge lp://staging/~james-page/charms/quantal/ceph/trunk into lp://staging/~charmers/charms/quantal/ceph/trunk
Proposed by
James Page
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 51 | ||||
| Proposed branch: | lp://staging/~james-page/charms/quantal/ceph/trunk | ||||
| Merge into: | lp://staging/~charmers/charms/quantal/ceph/trunk | ||||
| Diff against target: |
156 lines (+59/-17) 4 files modified
config.yaml (+11/-2) hooks/hooks.py (+28/-7) hooks/utils.py (+19/-7) revision (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~james-page/charms/quantal/ceph/trunk | ||||
| Related bugs: |
|
||||
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juan L. Negron (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
1) Support use of cloud: prefix to pull ceph from the Ubuntu cloud archive.
2) Better filesystem handling both of OSD devices and stealing the ephemeral mount in cloud instances
3) 'force' option to make the charm reformat devices which are not in use which might already be OSD devices.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks good to me.
Approved.
Will merge in a minute.
-Juan