Merge lp://qastaging/~gandelman-a/charms/precise/hacluster/ocf into lp://qastaging/charms/hacluster

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 14
Proposed branch: lp://qastaging/~gandelman-a/charms/precise/hacluster/ocf
Merge into: lp://qastaging/charms/hacluster
Diff against target: 349 lines (+308/-1)
3 files modified
hooks/hooks.py (+11/-0)
ocf/ceph/rbd (+296/-0)
revision (+1/-1)
To merge this branch: bzr merge lp://qastaging/~gandelman-a/charms/precise/hacluster/ocf
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+151345@code.qastaging.launchpad.net

Description of the change

This ships the ceph RBD resource agent directly in the charm, copied from the version of ceph shipped /w quantal (.48) This is a complicated matter currently and hopefully this is only a temporary solution:

- The .46 ceph-resource-agents in precise do not include the rbd RA.
- The .48 ceph-resource-agents in quantal does. However, setting up cloud-archive access to install it would also upgrade any ceph packages installed by the principle.
- The .56 ceph-resource-agents in raring is not compatible /w the rbd CLI in .46 or .48.

I'd like to ping the OCF author about possibly supporting different versions /w a single RA.

Until then, ACAICS best solution is to ship and install RA's /w the charm.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Adam - generally looks OK;

1) Ceph resource agents still gets installed - think we need to drop this right?

    if True in [ra.startswith('ocf:ceph')
                for ra in resources.itervalues()]:
        utils.install('ceph-resource-agents')

Other than that look good to me.

review: Needs Fixing
Revision history for this message
Adam Gandelman (gandelman-a) wrote :

The rbd OCF is not included in the .041 release, but it is /w .48 + .56. The .56 OCF is updated for rbd syntax changes. I thought the easiest way to keep this charm able to deploy across all versions would be to install the rbd OCF packaged with the charm along with the package, so that if it is included /w the package proper, it will override the one copied from the charm.

Revision history for this message
James Page (james-page) wrote :

OK - testing with the mysql and rabbitmq updates which use these features - will verify on raring and precise.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches