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 |
Related bugs: |
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.
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/