Juju Charms Collection
openstack-dashboard package

Merge lp://staging/~bac/charms/trusty/openstack-dashboard/dashboard-plugin into lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

  1. Trusty Tahr (14.04)
  2. dashboard-plugin
  3. Merge into next
Proposed by Brad Crittenden
Status: Merged
Merged at revision: 90
Proposed branch: lp://staging/~bac/charms/trusty/openstack-dashboard/dashboard-plugin
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 116 lines (+47/-6)
4 files modified
hooks/horizon_hooks.py (+12/-3)
hooks/horizon_utils.py (+1/-0)
metadata.yaml (+3/-3)
unit_tests/test_horizon_hooks.py (+31/-0)
To merge this branch: bzr merge lp://staging/~bac/charms/trusty/openstack-dashboard/dashboard-plugin
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+270177@code.staging.launchpad.net

Description of the change

This branch adds a new relation 'dashboard-plugin' for openstack-dashboard to communicate to subordinate plugin charms details about the installation so the plugin can insert itself.

Currently the two pieces of information sent via the relationship are bin_path and openstack_dir.

The bin_path can be different based on how openstack is installed by the charm. If installed via distro or cloud-archive, a debian package is used to install openstack and the system python libraries are modified. If installed via git source then a virtual environment is used. If a subordinate charm needs to install python packages via pip then it needs to know which pip to use. bin_path specifies the correct environment to use, either /usr/bin or the result of git_pip_venv_dir.

openstack_dir provides the path to where openstack is installed. Currently it is always /usr/share/openstack_dashboard. From that information the subordinate can figure out the path to local/enabled for adding dashboard enabling slugs (e.g. _50_mydashboard.py).

To post a comment you must log in.
lp://staging/~bac/charms/trusty/openstack-dashboard/dashboard-plugin updated
83. By James Page

[trivial] Resync helpers to pickup liberty version detection

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

charm_lint_check #9387 openstack-dashboard-next for bac mp270177
    LINT FAIL: lint-test failed

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

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

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

charm_unit_test #8682 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_lint_check #9389 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_unit_test #8684 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #6251 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

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

charm_amulet_test #6253 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

lp://staging/~bac/charms/trusty/openstack-dashboard/dashboard-plugin updated
84. By James Page

[1chb1n,r=james-page]

Update tests for T-K, V-K, prep for T-L and W-L. Clean up old lint. Resolve bug 1474030 race in svc restart checks.

85. By Brad Crittenden

Add dashboard-plugin relation

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

charm_lint_check #10965 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_amulet_test #6858 openstack-dashboard-next for bac mp270177
    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/12606204/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6858/

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

charm_unit_test #10235 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_lint_check #11025 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_amulet_test #6874 openstack-dashboard-next for bac mp270177
    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/12612946/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6874/

Revision history for this message
Liam Young (gnuoy) wrote :

See inline comment

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

charm_lint_check #11091 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_unit_test #10299 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #6897 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

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

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

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

charm_lint_check #11097 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_unit_test #10305 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #6907 openstack-dashboard-next for bac mp270177
    AMULET FAIL: amulet-test failed

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

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

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

charm_lint_check #11150 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_unit_test #10355 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_unit_test #10357 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_lint_check #11155 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_amulet_test #6927 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

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

charm_amulet_test #6932 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

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

charm_amulet_test #7030 openstack-dashboard-next for bac mp270177
    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/12645015/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7030/

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

charm_lint_check #11329 openstack-dashboard-next for bac mp270177
    LINT OK: passed

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

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

charm_unit_test #10523 openstack-dashboard-next for bac mp270177
    UNIT OK: passed

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

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

charm_amulet_test #7115 openstack-dashboard-next for bac mp270177
    AMULET OK: passed

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

Revision history for this message
Brad Crittenden (bac) wrote :

Liam I have made the change you requested and now have all tests passing since the problem with CI was resolved. Please take another look and let me know how we can get this merged.

Revision history for this message
Liam Young (gnuoy) wrote :

approve

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