Merge lp://staging/~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr into lp://staging/~openstack-charmers-archive/charms/trusty/percona-cluster/next

Proposed by Данило Шеган
Status: Merged
Merged at revision: 77
Proposed branch: lp://staging/~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/percona-cluster/next
Diff against target: 117 lines (+67/-4)
2 files modified
hooks/percona_hooks.py (+4/-3)
unit_tests/test_percona_hooks.py (+63/-1)
To merge this branch: bzr merge lp://staging/~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+272813@code.staging.launchpad.net

Description of the change

Make percona-cluster auto-detect vip_cidr and vip_iface like other charms

percona-cluster is currently behaving differently from other OpenStack charms: it does not attempt to auto-detect a VIP CIDR at all.

This branch (which is mostly by Andreas) changes that to behave like all other charms: autodetect first, if it fails, use the passed-in config value.

I've added a few unit tests for all the cases.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #11026 percona-cluster-next for danilo mp272813
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11026/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #10236 percona-cluster-next for danilo mp272813
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10236/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6879 percona-cluster-next for danilo mp272813
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6879/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI, full amulet output: http://paste.ubuntu.com/12619610/

Be aware, that the percona-cluster amulet tests are on my list to refactor and extend. Until then, these existing tests do exercise some basic functionality, on Trusty only.

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