Merge lp://qastaging/~billy-olsen/charms/trusty/heat/backport-lp1398182 into lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/trunk

Proposed by Billy Olsen
Status: Needs review
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/heat/backport-lp1398182
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/trunk
Diff against target: 351 lines (+145/-61)
5 files modified
config.yaml (+13/-1)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+49/-44)
hooks/heat_relations.py (+25/-11)
unit_tests/test_heat_relations.py (+33/-5)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/heat/backport-lp1398182
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
charmers Pending
Review via email: mp+262003@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5406 heat for billy-olsen mp262003
    LINT OK: passed

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

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

charm_unit_test #5038 heat for billy-olsen mp262003
    UNIT OK: passed

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

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

charm_amulet_test #4649 heat for billy-olsen mp262003
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/11721165/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4649/

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Note there aren't heat amulet tests thus the fail.

review: Approve
44. By Billy Olsen

Official c-h stable sync

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

charm_lint_check #5464 heat for billy-olsen mp262003
    LINT OK: passed

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

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

charm_unit_test #5096 heat for billy-olsen mp262003
    UNIT OK: passed

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

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

charm_amulet_test #4668 heat for billy-olsen mp262003
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/11737940/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4668/

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

charm_lint_check #7749 heat for billy-olsen mp262003
    LINT OK: passed

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

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

charm_unit_test #7192 heat for billy-olsen mp262003
    UNIT OK: passed

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

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

charm_lint_check #12339 heat for billy-olsen mp262003
    LINT OK: passed

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

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

charm_unit_test #11448 heat for billy-olsen mp262003
    UNIT OK: passed

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

Unmerged revisions

44. By Billy Olsen

Official c-h stable sync

43. By Billy Olsen

[billy-olsen,r=] Provide support for user-specified public endpoint hostname.

Closes-Bug: #1398182

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