Merge lp://qastaging/~billy-olsen/charms/trusty/openstack-dashboard/endpoint_types into lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Proposed by Billy Olsen
Status: Merged
Merged at revision: 88
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/openstack-dashboard/endpoint_types
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 165 lines (+75/-1)
5 files modified
config.yaml (+8/-0)
hooks/horizon_contexts.py (+39/-1)
templates/icehouse/local_settings.py (+6/-0)
templates/juno/local_settings.py (+6/-0)
unit_tests/test_horizon_contexts.py (+16/-0)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/openstack-dashboard/endpoint_types
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+271026@code.qastaging.launchpad.net

Description of the change

Adds the ability to define the endpoint type(s) that the OpenStack Dashboard should use when using services from the keystone catalog.

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

charm_lint_check #9941 openstack-dashboard-next for billy-olsen mp271026
    LINT OK: passed

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

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

charm_unit_test #9159 openstack-dashboard-next for billy-olsen mp271026
    UNIT OK: passed

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

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

Not a full review, but id'd 1 small typo in-line.

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

charm_amulet_test #6424 openstack-dashboard-next for billy-olsen mp271026
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

87. By Billy Olsen

Fix typo per code review feedback.

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

charm_lint_check #10254 openstack-dashboard-next for billy-olsen mp271026
    LINT OK: passed

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

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

charm_unit_test #9409 openstack-dashboard-next for billy-olsen mp271026
    UNIT OK: passed

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

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

charm_amulet_test #6495 openstack-dashboard-next for billy-olsen mp271026
    AMULET OK: passed

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

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

Approved, nice patch.

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