Merge lp:~james-page/charms/raring/ceph/trunk into lp:~charmers/charms/precise/ceph/trunk
Proposed by
James Page
Status: | Merged |
---|---|
Approved by: | Mark Mims |
Approved revision: | 60 |
Merged at revision: | 54 |
Proposed branch: | lp:~james-page/charms/raring/ceph/trunk |
Merge into: | lp:~charmers/charms/precise/ceph/trunk |
Diff against target: |
385 lines (+157/-23) 6 files modified
config.yaml (+19/-1) hooks/ceph.py (+26/-0) hooks/hooks.py (+58/-11) hooks/utils.py (+47/-10) revision (+1/-1) templates/ceph.conf (+6/-0) |
To merge this branch: | bzr merge lp:~james-page/charms/raring/ceph/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mark Mims (community) | Approve | ||
Review via email: mp+142897@code.launchpad.net |
Description of the change
Updates to support newer releases of ceph.
Updates are backwards compatibile with precise/0.48.x series and have been testing using the following combos:
precise/0.48.2
quantal/0.48.2
raring/0.56.1
To post a comment you must log in.
My only concern is that in the function get_mon_hosts, it is possible that NXDOMAIN (which certainly seems could potentially happen) will result in None:6789 as one of the items in the hosts list:
This list is then passed on to ceph via /etc/ceph/ ceph.conf, so this may be fine. But it also seems potentially problematic.
Maybe instead we should simply not append an unresolved address to hosts. Another possibility is to do a retry on get_host_ip. Alternatively instead of swallowing the error, we could force the juju admin to resolve this problem. That does sound more painful however.