diff --git a/templates/icehouse/nova.conf b/templates/icehouse/nova.conf
index 4a768006..8fa8e094 100644
--- a/templates/icehouse/nova.conf
+++ b/templates/icehouse/nova.conf
@@ -155,19 +155,16 @@ cpu_mode = {{ cpu_mode }}
 {% if cpu_model -%}
 cpu_model = {{ cpu_model }}
 {% endif -%}
-{% if libvirt_images_type -%}
+{% if libvirt_images_type and rbd_pool -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}
 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
-inject_password=false
-inject_key=false
-inject_partition=-2
+inject_password = false
+inject_key = false
+inject_partition = -2
 {% endif -%}
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
diff --git a/templates/juno/nova.conf b/templates/juno/nova.conf
index 03a022ea..773e90eb 100644
--- a/templates/juno/nova.conf
+++ b/templates/juno/nova.conf
@@ -148,25 +148,22 @@ cpu_mode = {{ cpu_mode }}
 {% if cpu_model -%}
 cpu_model = {{ cpu_model }}
 {% endif -%}
-{% if libvirt_images_type -%}
+{% if libvirt_images_type and rbd_pool -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}
 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
-inject_password=false
-inject_key=false
-inject_partition=-2
+inject_password = false
+inject_key = false
+inject_partition = -2
 {% endif -%}
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
-{% endif -%}
+{% endif %}
 
 {% include "parts/cinder" %}
 
diff --git a/templates/liberty/nova.conf b/templates/liberty/nova.conf
index b3a8b4ff..a0b7f085 100644
--- a/templates/liberty/nova.conf
+++ b/templates/liberty/nova.conf
@@ -162,25 +162,22 @@ cpu_mode = {{ cpu_mode }}
 {% if cpu_model -%}
 cpu_model = {{ cpu_model }}
 {% endif -%}
-{% if libvirt_images_type -%}
+{% if libvirt_images_type and rbd_pool -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}
 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
-inject_password=false
-inject_key=false
-inject_partition=-2
+inject_password = false
+inject_key = false
+inject_partition = -2
 {% endif -%}
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
-{% endif -%}
+{% endif %}
 
 {% include "parts/section-database" %}
 
@@ -188,3 +185,6 @@ disk_cachemodes = {{ disk_cachemodes }}
 
 [oslo_concurrency]
 lock_path=/var/lock/nova
+
+[workarounds]
+disable_libvirt_livesnapshot = False
diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index 7730c631..6cdffa6a 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -163,25 +163,22 @@ cpu_mode = {{ cpu_mode }}
 {% if cpu_model -%}
 cpu_model = {{ cpu_model }}
 {% endif -%}
-{% if libvirt_images_type -%}
+{% if libvirt_images_type and rbd_pool -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}
 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
-inject_password=false
-inject_key=false
-inject_partition=-2
+inject_password = false
+inject_key = false
+inject_partition = -2
 {% endif -%}
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
-{% endif -%}
+{% endif %}
 
 {% include "parts/section-database" %}
 
@@ -191,3 +188,6 @@ disk_cachemodes = {{ disk_cachemodes }}
 
 [oslo_concurrency]
 lock_path=/var/lock/nova
+
+[workarounds]
+disable_libvirt_livesnapshot = False