Merge lp:~jamesbeedy/charms/trusty/nova-compute/next into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[james beedy]

Enable live migration between heterogeneous kvm hypervisors.

Fixes: Bug #1499611

Enable live migration between heterogeneous kvm hypervisors.

Modified NovaComputeLibvirtContext in nova_compute_context.py to
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

[uosci-testing-bot (uosci-testing-bot)]

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/
Build: http://10.245.162.77:8080/job/charm_lint_check/10763/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10769 nova-compute-next for jamesbeedy mp272431
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9947 nova-compute-next for jamesbeedy mp272431
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6774 nova-compute-next for jamesbeedy mp272431
    AMULET OK: passed

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

[Liam Young (gnuoy)]

approved

review: Approve

[Liam Young (gnuoy)]

Thank for taking the time to create this patch, it is very much appreciated!

[james beedy (jamesbeedy)]

NP! Thank you for accepting!

=== modified file 'config.yaml'
--- config.yaml	2015-08-13 09:11:23 +0000
+++ config.yaml	2015-09-25 15:32:16 +0000
@@ -211,6 +211,22 @@
       order for this charm to function correctly, the privacy extension must be
       disabled and a non-temporary address must be configured/available on
       your network interface.
+  cpu-mode:
+    type: string
+    default:
+    description: |
+      Set to 'host-model' to clone the host CPU feature flags; to 
+      'host-passthrough' to use the host CPU model exactly; to 'custom' to 
+      use a named CPU model; to 'none' to not set any CPU model. If 
+      virt_type='kvm|qemu', it will default to 'host-model', otherwise it will 
+      default to 'none'.
+  cpu-model:
+    type: string
+    default:
+    description: |
+      Set to a named libvirt CPU model (see names listed in 
+      /usr/share/libvirt/cpu_map.xml). Only has effect if cpu_mode='custom' and 
+      virt_type='kvm|qemu'.
   # Storage configuration options
   libvirt-image-backend:
     type: string

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-08-13 10:31:20 +0000
+++ hooks/nova_compute_context.py	2015-09-25 15:32:16 +0000
@@ -124,6 +124,12 @@
         if config('disk-cachemodes'):
             ctxt['disk_cachemodes'] = config('disk-cachemodes')
 
+        if config('cpu-mode'):
+            ctxt['cpu_mode'] = config('cpu-mode')
+
+        if config('cpu-model'):
+            ctxt['cpu_model'] = config('cpu-model')
+
         if config('hugepages'):
             ctxt['hugepages'] = True
 

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2015-04-13 12:22:05 +0000
+++ templates/havana/nova.conf	2015-09-25 15:32:16 +0000
@@ -128,6 +128,12 @@
 {% endif -%}
 
 [libvirt]
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}
+{% if cpu_model -%}
+cpu_model = {{ cpu_model }}
+{% endif -%}
 {% if libvirt_images_type -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-09-23 14:01:44 +0000
+++ templates/icehouse/nova.conf	2015-09-25 15:32:16 +0000
@@ -146,6 +146,12 @@
 {% endif -%}
 
 [libvirt]
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}
+{% if cpu_model -%}
+cpu_model = {{ cpu_model }}
+{% endif -%}
 {% if libvirt_images_type -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-08-25 17:40:00 +0000
+++ templates/juno/nova.conf	2015-09-25 15:32:16 +0000
@@ -142,6 +142,12 @@
 {% endif -%}
 
 [libvirt]
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}
+{% if cpu_model -%}
+cpu_model = {{ cpu_model }}
+{% endif -%}
 {% if libvirt_images_type -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-08-25 17:40:00 +0000
+++ templates/kilo/nova.conf	2015-09-25 15:32:16 +0000
@@ -147,6 +147,12 @@
 {% endif -%}
 
 [libvirt]
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}
+{% if cpu_model -%}
+cpu_model = {{ cpu_model }}
+{% endif -%}
 {% if libvirt_images_type -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}