Merge "NFS based live-migration fix"

Juniper · Feb 10, 2017 · 8810880 · 8810880
2 parents d9b791a + 46d6db5
commit 8810880
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/contrail_provisioning/storage/compute/livemigration.py b/contrail_provisioning/storage/compute/livemigration.py
@@ -52,6 +52,11 @@ def __init__(self, args_str = None):
                    libvirt_configured = run('cat %s |grep "\-d \-l"| wc -l' %(LIBVIRTD_UBUNTU_BIN_CONF))
                    if libvirt_configured == '0':
                        run('cat %s | sed s/"-d"/"-d -l"/ > %s' %(LIBVIRTD_UBUNTU_BIN_CONF, LIBVIRTD_TMP_BIN_CONF), shell='/bin/bash')
+                       libvirt_enabled = run('cat %s |grep "^libvirtd_opts"| wc -l' %(LIBVIRTD_UBUNTU_BIN_CONF))
+                       if libvirt_enabled == '0':
+                           run('echo \'libvirtd_opts="-l"\' >> %s' %(LIBVIRTD_TMP_BIN_CONF))
+                       #else:
+                       #Handle other cases
                        run('cp -f %s %s' %(LIBVIRTD_TMP_BIN_CONF, LIBVIRTD_UBUNTU_BIN_CONF))
                        run('service nova-compute restart')
                        run('service libvirt-bin restart')