Juju Charms Collection
openstack-dashboard package

Merge lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings into lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

  1. Trusty Tahr (14.04)
  2. simplify-settings
  3. Merge into next
Proposed by Michał Sawicz
Status: Merged
Merged at revision: 85
Proposed branch: lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 173 lines (+68/-1)
11 files modified
hooks/horizon_contexts.py (+25/-0)
hooks/horizon_hooks.py (+11/-0)
hooks/horizon_utils.py (+2/-1)
metadata.yaml (+3/-0)
templates/essex/local_settings.py (+2/-0)
templates/folsom/local_settings.py (+2/-0)
templates/grizzly/local_settings.py (+2/-0)
templates/havana/local_settings.py (+2/-0)
templates/icehouse/local_settings.py (+2/-0)
templates/juno/local_settings.py (+2/-0)
unit_tests/test_horizon_contexts.py (+15/-0)
To merge this branch: bzr merge lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+269342@code.staging.launchpad.net

Commit message

Add support for plugins to inject settings into local_settings.py

Description of the change

First consumer of this:

lp:~sdn-charmers/charms/trusty/horizon-contrail/trunk

To post a comment you must log in.
lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings updated
82. By Michał Sawicz

Undo test changes

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

charm_lint_check #8821 openstack-dashboard-next for saviq mp269342
    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/12205247/
Build: http://10.245.162.77:8080/job/charm_lint_check/8821/

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

charm_unit_test #8150 openstack-dashboard-next for saviq mp269342
    UNIT OK: passed

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

lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings updated
83. By Michał Sawicz

Drop empty line

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

charm_amulet_test #6055 openstack-dashboard-next for saviq mp269342
    AMULET FAIL: amulet-test failed

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

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

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

charm_lint_check #8823 openstack-dashboard-next for saviq mp269342
    LINT OK: passed

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

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

charm_unit_test #8151 openstack-dashboard-next for saviq mp269342
    UNIT OK: passed

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

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

charm_amulet_test #6057 openstack-dashboard-next for saviq mp269342
    AMULET FAIL: amulet-test failed

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

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

lp://staging/~saviq/charms/trusty/openstack-dashboard/simplify-settings updated
84. By Michał Sawicz

Merge next

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

charm_lint_check #8826 openstack-dashboard-next for saviq mp269342
    LINT OK: passed

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

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

charm_unit_test #8154 openstack-dashboard-next for saviq mp269342
    UNIT OK: passed

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

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

charm_amulet_test #6060 openstack-dashboard-next for saviq mp269342
    AMULET FAIL: amulet-test failed

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

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

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

Superseded by lp:~gnuoy/charms/trusty/openstack-dashboard/plugin-relation

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