Merge lp://qastaging/~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr-stable into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/trunk

Proposed by Данило Шеган
Status: Merged
Merged at revision: 66
Proposed branch: lp://qastaging/~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr-stable
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/trunk
Diff against target: 130 lines (+68/-5)
3 files modified
hooks/percona_hooks.py (+4/-3)
metadata.yaml (+1/-1)
unit_tests/test_percona_hooks.py (+63/-1)
To merge this branch: bzr merge lp://qastaging/~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr-stable
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Ryan Beisner (community) Needs Fixing
Review via email: mp+272881@code.qastaging.launchpad.net

Description of the change

Merge r77 from next charms: autodetect vip_cidr and vip_iface like other OpenStack charms.

Fixes bug 1498605.

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

charm_lint_check #11088 percona-cluster for danilo mp272881
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12623328/
Build: http://10.245.162.77:8080/job/charm_lint_check/11088/

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

charm_unit_test #10296 percona-cluster for danilo mp272881
    UNIT OK: passed

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

Revision history for this message
Данило Шеган (danilo) wrote :

FWIW, none of the lint problems are due to this branch, and considering this is a stable branch, I'd rather not fix them.

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

@danilo

Even though it's not directly related to your changes, pPlease do rename the "categories" field to "tags" in the metadata.yaml file. If that's not fixed, it will prevent charmstore ingestion.

Thank you.

review: Needs Fixing
67. By Данило Шеган

Rename "categories" to "tags" in metadata.yaml as suggested in review by Ryan Beisner.

Revision history for this message
Данило Шеган (danilo) wrote :

Fixed, thanks.

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

charm_unit_test #10298 percona-cluster for danilo mp272881
    UNIT OK: passed

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

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

charm_lint_check #11092 percona-cluster for danilo mp272881
    LINT OK: passed

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

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

charm_amulet_test #6895 percona-cluster for danilo mp272881
    AMULET OK: passed

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

Revision history for this message
Chris Glass (tribaal) wrote :

Looks good! thanks for fixing s/categories/tags/
+1

review: Approve

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

to status/vote changes: