Merge lp://staging/~jseutter/charms/precise/cinder/ha-support-with-health into lp://staging/charms/raring/cinder
Proposed by
Jerry Seutter
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~jseutter/charms/precise/cinder/ha-support-with-health |
| Merge into: | lp://staging/charms/raring/cinder |
| Diff against target: |
928 lines (+639/-136) (has conflicts) 10 files modified
config.yaml (+28/-0) hooks/cinder-common (+1/-1) hooks/cinder-hooks (+111/-15) hooks/lib/openstack-common (+459/-120) metadata.yaml (+6/-0) revision (+4/-0) scripts/add_to_cluster (+2/-0) scripts/health_checks.d/service_ports_live (+13/-0) scripts/health_checks.d/service_running (+13/-0) scripts/remove_from_cluster (+2/-0) Text conflict in hooks/lib/openstack-common Text conflict in revision |
| To merge this branch: | bzr merge lp://staging/~jseutter/charms/precise/cinder/ha-support-with-health |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Smith (community) | Needs Fixing | ||
| Adam Gandelman | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-03-04.
Description of the change
This branch adds add_to_cluster, remove_from_cluster and health_scripts.d to the cinder charm.
The health scripts check the following things:
- The crm multicast port is open
- cinder-api service is running
- cinder-scheduler service is running
- cinder-volume service is running
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
please resubmit this merge proposal against lp:~openstack-charmers/charms/precise/cinder/ha-support so it clears up the diff.