Merge lp:~corey.bryant/charms/trusty/nova-compute/fix-for-oil-1352506 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Corey Bryant]

[Corey Bryant (corey.bryant)]

This fixes an error where the virsh command uses the default URI, which may or may not match the hypervisor specified in the virt-type config option. For example, if virt-type=lxc, the qemu:///system URI is used, whereas the correct URI that should be used is lxc:///.

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2014-07-09 13:42:57 +0000
+++ hooks/nova_compute_utils.py	2014-08-20 02:39:53 +0000
@@ -128,6 +128,15 @@
     'lxc': ['nova-compute-lxc'],
 }
 
+# Maps virt-type config to a libvirt URI.
+LIBVIRT_URIS = {
+    'kvm': 'qemu:///system',
+    'qemu': 'qemu:///system',
+    'xen': 'xen:///',
+    'uml': 'uml:///system',
+    'lxc': 'lxc:///',
+}
+
 
 def ceph_config_file():
     return CHARM_CEPH_CONF.format(service_name())
@@ -422,14 +431,15 @@
 
 
 def create_libvirt_secret(secret_file, secret_uuid, key):
-    if secret_uuid in check_output(['virsh', 'secret-list']):
+    uri = LIBVIRT_URIS[config('virt-type')]
+    if secret_uuid in check_output(['virsh', '-c', uri, 'secret-list']):
         log('Libvirt secret already exists for uuid %s.' % secret_uuid,
             level=DEBUG)
         return
     log('Defining new libvirt secret for uuid %s.' % secret_uuid)
-    cmd = ['virsh', 'secret-define', '--file', secret_file]
+    cmd = ['virsh', '-c', uri, 'secret-define', '--file', secret_file]
     check_call(cmd)
-    cmd = ['virsh', 'secret-set-value', '--secret', secret_uuid,
+    cmd = ['virsh', '-c', uri, 'secret-set-value', '--secret', secret_uuid,
            '--base64', key]
     check_call(cmd)