Juju Charms Collection
nova-cloud-controller package

Merge lp://staging/~freyes/charms/trusty/nova-cloud-controller/lp1387073 into lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Trusty Tahr (14.04)
lp1387073
Merge into next

Proposed by Felipe Reyes on 2015-09-17

Status:

Merged

Merged at revision:

193

Proposed branch:

lp://staging/~freyes/charms/trusty/nova-cloud-controller/lp1387073

Merge into:

lp://staging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Diff against target:

97 lines (+23/-4)

7 files modified

config.yaml (+6/-0)
hooks/nova_cc_context.py (+1/-0)
templates/havana/nova.conf (+2/-1)
templates/icehouse/nova.conf (+1/-1)
templates/juno/nova.conf (+1/-1)
templates/kilo/nova.conf (+1/-1)
unit_tests/test_nova_cc_contexts.py (+11/-0)

To merge this branch:

bzr merge lp://staging/~freyes/charms/trusty/nova-cloud-controller/lp1387073

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Liam Young (community)		2015-09-17	Approve on 2015-09-28
Review via email: mp+271554@code.staging.launchpad.net

Description of the change

Dear OpenStack Charmers,

This MP exposes the scheduler_default_filters from nova.conf as a config option. By default uses the same set of filters that was hardcoded in the template.

This MP adds a basic unit test for NovaConfigContext class.

Best Regards,

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-17:

charm_lint_check #10195 nova-cloud-controller-next for freyes mp271554
LINT FAIL: lint-test failed
LINT FAIL: charm-proof failed

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

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-17:

charm_unit_test #9353 nova-cloud-controller-next for freyes mp271554
UNIT OK: passed

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

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-09-17:

charm_amulet_test #6484 nova-cloud-controller-next for freyes mp271554
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/12441644/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6484/

Revision history for this message

Liam Young (gnuoy) wrote on 2015-09-28:

The amulet fail looks to do with a known race and other tests did pass. The lint error is a minor charm proof issue unrelated to this change, so LGTM! Thanks for the mp

review: Approve