diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 54708a3..337b3f5 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -6228,7 +6228,9 @@
 #   'block_migration_flag' to enable tunneled migration.
 #  (boolean value)
 #live_migration_tunnelled=false
-live_migration_tunnelled=true
+{%- if compute.libvirt.live_migration_tunnelled is defined %}
+live_migration_tunnelled = {{ compute.libvirt.live_migration_tunnelled }}
+{%- endif %}
 
 #
 # Maximum bandwidth(in MiB/s) to be used during migration.
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index e200640..824a569 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -67,6 +67,7 @@
         port: 11211
     libvirt:
       hw_disk_discard: unmap
+      live_migration_tunnelled: False
     upgrade_levels:
       compute: liberty
     libvirt_service_group: libvirtd