Juju Charms Collection
cinder package

Merge lp://qastaging/~james-page/charms/trusty/cinder/lp1521604 into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next

  1. Trusty Tahr (14.04)
  2. lp1521604
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 140
Proposed branch: lp://qastaging/~james-page/charms/trusty/cinder/lp1521604
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 98 lines (+44/-2)
4 files modified
hooks/cinder_hooks.py (+6/-2)
hooks/cinder_utils.py (+9/-0)
unit_tests/test_cinder_hooks.py (+8/-0)
unit_tests/test_cinder_utils.py (+21/-0)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/cinder/lp1521604
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+281799@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-01-06.

Description of the change

Drop requirement for identity service unless api service is enabled.

To post a comment you must log in.
lp://qastaging/~james-page/charms/trusty/cinder/lp1521604 updated
141. By James Page

Also avoid overwrite of actual endpoint information for service instances where api service is not enabled

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

charm_lint_check #16668 cinder-next for james-page mp281799
    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/14424371/
Build: http://10.245.162.77:8080/job/charm_lint_check/16668/

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

charm_unit_test #15565 cinder-next for james-page mp281799
    UNIT OK: passed

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

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

charm_amulet_test #8544 cinder-next for james-page mp281799
    AMULET OK: passed

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

lp://qastaging/~james-page/charms/trusty/cinder/lp1521604 updated
142. By James Page

Tidy lint

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

charm_lint_check #16726 cinder-next for james-page mp281799
    LINT OK: passed

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

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

charm_unit_test #15620 cinder-next for james-page mp281799
    UNIT OK: passed

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

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

charm_amulet_test #8551 cinder-next for james-page mp281799
    AMULET OK: passed

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

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

LGTM, approved

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