Merge lp:~jamesbeedy/charms/trusty/nova-compute/next into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
james beedy
Status: | Merged |
---|---|
Merged at revision: | 172 |
Proposed branch: | lp:~jamesbeedy/charms/trusty/nova-compute/next |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
111 lines (+46/-0) 6 files modified
config.yaml (+16/-0) hooks/nova_compute_context.py (+6/-0) templates/havana/nova.conf (+6/-0) templates/icehouse/nova.conf (+6/-0) templates/juno/nova.conf (+6/-0) templates/kilo/nova.conf (+6/-0) |
To merge this branch: | bzr merge lp:~jamesbeedy/charms/trusty/nova-compute/next |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Antonio Rosales | Pending | ||
James Page | Pending | ||
Review via email: mp+272431@code.launchpad.net |
This proposal supersedes a proposal from 2015-09-25.
Commit message
Enable live migration between heterogeneous kvm hypervisors.
Fixes: Bug #1499611
Description of the change
Enable live migration between heterogeneous kvm hypervisors.
Modified NovaComputeLibv
transclude 'cpu-mode' and 'cpu-model' into nova.conf.
Added conditional tags for 'cpu_mode' and 'cpu_model' to the havana,
icehouse, juno, and kilo nova.conf templates.
Added 'cpu-mode' and 'cpu-model' string params and descriptions to
config.yaml.
Fixes: Bug #1499611
To post a comment you must log in.
charm_lint_check #10763 nova-compute-next for jamesbeedy mp272420
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/12555280/ 10.245. 162.77: 8080/job/ charm_lint_ check/10763/
Build: http://