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

[Liang Chen]

Making sure libvirt daemon gets a unique host_uuid on every host. Because some hardware doesn't always provide a valid unique uuid by means of "dmidecode -s system-uuid" that libvirt by default uses, which may lead to at least live-migration error shown in the related bug.

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

charm_lint_check #1514 nova-compute-next for cbjchen mp248450
    LINT OK: passed

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

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

charm_unit_test #1469 nova-compute-next for cbjchen mp248450
    UNIT OK: passed

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

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

charm_amulet_test #1633 nova-compute-next for cbjchen mp248450
    AMULET OK: passed

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

[Edward Hope-Morley (hopem)]

LGTM +1

review: Approve

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-12-15 10:28:47 +0000
+++ hooks/nova_compute_context.py	2015-02-03 20:50:32 +0000
@@ -1,3 +1,5 @@
+import uuid
+
 from charmhelpers.contrib.openstack import context
 from charmhelpers.core.host import service_running, service_start
 from charmhelpers.fetch import apt_install, filter_installed_packages
@@ -119,6 +121,7 @@
         if config('disk-cachemodes'):
             ctxt['disk_cachemodes'] = config('disk-cachemodes')
 
+        ctxt['host_uuid'] = '%s' % uuid.uuid4()
         return ctxt
 
 

=== modified file 'templates/libvirtd.conf'
--- templates/libvirtd.conf	2013-08-01 23:21:58 +0000
+++ templates/libvirtd.conf	2015-02-03 20:50:32 +0000
@@ -374,6 +374,7 @@
 # uncomment this entry
 #host_uuid = "00000000-0000-0000-0000-000000000000"
 
+host_uuid = "{{ host_uuid }}"
 ###################################################################
 # Keepalive protocol:
 # This allows libvirtd to detect broken client connections or even

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2014-12-03 23:23:54 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-02-03 20:50:32 +0000
@@ -173,21 +173,34 @@
 
     def test_libvirt_bin_context_no_migration(self):
         self.test_config.set('enable-live-migration', False)
-        libvirt = context.NovaComputeLibvirtContext()
-        self.assertEquals({'libvirtd_opts': '-d', 'listen_tls': 0}, libvirt())
+        with patch('uuid.uuid4') as uid:
+            uid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
+            libvirt = context.NovaComputeLibvirtContext()()
+        self.assertEqual(
+            {'libvirtd_opts': '-d',
+             'listen_tls': 0,
+             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt)
 
     def test_libvirt_bin_context_migration_tcp_listen(self):
         self.test_config.set('enable-live-migration', True)
-        libvirt = context.NovaComputeLibvirtContext()
-        self.assertEquals(
-            {'libvirtd_opts': '-d -l', 'listen_tls': 0}, libvirt())
+        with patch('uuid.uuid4') as uid:
+            uid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
+            libvirt = context.NovaComputeLibvirtContext()()
+        self.assertEqual(
+            {'libvirtd_opts': '-d -l',
+             'listen_tls': 0,
+             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt)
 
     def test_libvirt_disk_cachemodes(self):
         self.test_config.set('disk-cachemodes', 'file=unsafe,block=none')
-        libvirt = context.NovaComputeLibvirtContext()
-        self.assertEquals(
-            {'libvirtd_opts': '-d', 'listen_tls': 0,
-             'disk_cachemodes': 'file=unsafe,block=none'}, libvirt())
+        with patch('uuid.uuid4') as uid:
+            uid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
+            libvirt = context.NovaComputeLibvirtContext()()
+        self.assertEqual(
+            {'libvirtd_opts': '-d',
+             'listen_tls': 0,
+             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7',
+             'disk_cachemodes': 'file=unsafe,block=none'}, libvirt)
 
     @patch.object(context.NeutronComputeContext, 'network_manager')
     @patch.object(context.NeutronComputeContext, 'plugin')