Merge lp://qastaging/~marcoceppi/charms/trusty/nova-compute/trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Marco Ceppi
Status: Work in progress
Proposed branch: lp://qastaging/~marcoceppi/charms/trusty/nova-compute/trunk
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 220 lines (+104/-4) (has conflicts)
9 files modified
README.md (+76/-0)
charm-helpers-hooks.yaml (+1/-1)
charm-helpers-tests.yaml (+1/-1)
config.yaml (+8/-0)
hooks/nova_compute_context.py (+6/-0)
metadata.yaml (+1/-1)
templates/juno/nova.conf (+7/-0)
templates/kilo/nova.conf (+3/-0)
tests/basic_deployment.py (+1/-1)
Text conflict in README.md
To merge this branch: bzr merge lp://qastaging/~marcoceppi/charms/trusty/nova-compute/trunk
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+259139@code.qastaging.launchpad.net

Commit message

Add support for iscsi_use_multipath and use_cow_images in kilo and juno

Description of the change

This enables cinder-vnx and cinder-xtremio support for nova-compute by allowing the admin to enable/disable iscsi_use_multipath and use_cow_images which are required to be set for these two charms.

cs:~marcoceppi/trusty/cinder-vnx
cs:~marcoceppi/trusty/cinder-xtremio

I'd like, while being reviewed, if this change could be considered for a stable backport to the 15.04 OpenStack charms as there are solutions being published *soon* which reference these with the current release of the the OpenStack charms

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #4541 nova-compute-next for marcoceppi mp259139
    LINT OK: passed

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

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

charm_unit_test #4266 nova-compute-next for marcoceppi mp259139
    UNIT OK: passed

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

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

charm_amulet_test #4120 nova-compute-next for marcoceppi mp259139
    AMULET OK: passed

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Thank you for working on this. Some early input for you:

While this does pass CI, we won't be able to merge it into next as-is, because this MP is flipping stable bits on the next branch, pulling in some other uncommitted changes, and has a conflict.

I think it would be best to re-base from nova-compute/next and re-propose. It may also be worth adding contexts unit_test coverage for the new config options.

Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Thanks for the feedback, I'll rebase this on top of next and start working on testing

Revision history for this message
James Page (james-page) wrote :

Please set back to 'Needs Review' when this is ready for landing.

Unmerged revisions

136. By Marco Ceppi

Updated categories to tags

135. By Marco Ceppi

Ability to use cow-images as config

134. By Marco Ceppi

Add iscsi_use_multipath support for kilo and juno templates

133. By Marco Ceppi

Use text not booleans

132. By Marco Ceppi

Add iscsi_use_multipath support for libvirt

131. By Corey Bryant

[corey.bryant,trivial] Fix deploy from source README

130. By Billy Olsen

[niedbalski,r=wolsen] Check nrpe relation is made before configuring nrpe

Fixes-Bug: LP #1448143

129. By Liam Young

Point charmhelper sync and amulet tests at stable branches

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