Juju Charms Collection
openstack-dashboard package

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

Proposed by Billy Olsen on 2014-12-02

Status:

Merged

Merged at revision:

Proposed branch:

lp://qastaging/~billy-olsen/charms/trusty/openstack-dashboard/multi-region-dashboard

Merge into:

lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Diff against target:

127 lines (+68/-5)

4 files modified

hooks/horizon_contexts.py (+24/-5)
templates/icehouse/local_settings.py (+7/-0)
templates/juno/local_settings.py (+7/-0)
unit_tests/test_horizon_contexts.py (+30/-0)

To merge this branch:

bzr merge lp://qastaging/~billy-olsen/charms/trusty/openstack-dashboard/multi-region-dashboard

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
OpenStack Charmers		2014-12-02	Pending
Review via email: mp+243356@code.qastaging.launchpad.net

Commit message

[wolsen,r=]
Add support for handling multiple regions in the openstack-dashboard, either via multiple keystone services and/or multiple regions within a single keystone service.

Description of the change

Add support for handling multiple regions in the openstack-dashboard, either via multiple keystone services and/or multiple regions within a single keystone service.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-12-02:

UOSCI bot says:
charm_lint_check #1301 openstack-dashboard-next for billy-olsen mp243356
LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

Full lint test output: http://paste.ubuntu.com/9340357/
Build: http://10.98.191.181:8080/job/charm_lint_check/1301/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-12-02:

UOSCI bot says:
charm_unit_test #1135 openstack-dashboard-next for billy-olsen mp243356
UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/horizon_hooks 86 8 91% 73-74, 122-124, 149-150, 169
  hooks/horizon_utils 73 8 89% 135, 190-202
  TOTAL 232 17 93%
  Ran 41 tests in 1.569s
  OK

Full unit test output: http://paste.ubuntu.com/9340358/
Build: http://10.98.191.181:8080/job/charm_unit_test/1135/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-12-02:

UOSCI bot says:
charm_amulet_test #567 openstack-dashboard-next for billy-olsen mp243356
AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9340359/
Build: http://10.98.191.181:8080/job/charm_amulet_test/567/

Revision history for this message

Liang Chen (cbjchen) wrote on 2014-12-02:

Since the mutilple region support is handled by this patch, the following comments right above the changes in both local_setting can probably be removed.

# For multiple regions uncomment this configuration, and add (endpoint, title).
# AVAILABLE_REGIONS = [
# ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
# ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
# ]