Add image_volume_cache_enabled option for all backends
PROD-33378
Change-Id: Ife645554830c218acd4302ce623576a5d5e10715
diff --git a/cinder/files/backend/_bdd.conf b/cinder/files/backend/_bdd.conf
index f2a07a3..2dc6879 100644
--- a/cinder/files/backend/_bdd.conf
+++ b/cinder/files/backend/_bdd.conf
@@ -4,3 +4,4 @@
enable_unsupported_driver = {{ backend.enabled }}
volume_backend_name = {{ backend_name }}
volume_driver = cinder.volume.drivers.block_device.BlockDeviceDriver
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_fujitsu.conf b/cinder/files/backend/_fujitsu.conf
index 8c87d87..9b79ce7 100644
--- a/cinder/files/backend/_fujitsu.conf
+++ b/cinder/files/backend/_fujitsu.conf
@@ -4,3 +4,4 @@
volume_backend_name={{ backend_name }}
volume_driver={{ backend.get('driver', 'cinder.volume.drivers.fujitsu.fujitsu_eternus_dx_fc.FJDXFCDriver') }}
cinder_eternus_config_file=/etc/cinder/cinder_fujitsu_eternus_dx_{{ backend_name }}.xml
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_gpfs.conf b/cinder/files/backend/_gpfs.conf
index 3c2fcef..528b8f5 100644
--- a/cinder/files/backend/_gpfs.conf
+++ b/cinder/files/backend/_gpfs.conf
@@ -9,3 +9,4 @@
gpfs_max_clone_depth=3
gpfs_sparse_volumes=true
gpfs_storage_pool=system
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_hitachi_vsp.conf b/cinder/files/backend/_hitachi_vsp.conf
index cf4f78b..69441c2 100644
--- a/cinder/files/backend/_hitachi_vsp.conf
+++ b/cinder/files/backend/_hitachi_vsp.conf
@@ -67,3 +67,5 @@
#Range for ldev that shoudl be used
hitachi_ldev_range={{ backend.ldev_range }}
{%- endif %}
+
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_hp3par.conf b/cinder/files/backend/_hp3par.conf
index 4ed19ec..ed41939 100644
--- a/cinder/files/backend/_hp3par.conf
+++ b/cinder/files/backend/_hp3par.conf
@@ -51,4 +51,6 @@
hp3par_snapshot_retention=2
# Time in hours when a snapshot expires and is deleted. This must be larger than retention.
-hp3par_snapshot_expiration=4
\ No newline at end of file
+hp3par_snapshot_expiration=4
+
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
\ No newline at end of file
diff --git a/cinder/files/backend/_hp_lefthand.conf b/cinder/files/backend/_hp_lefthand.conf
index 343447e..0ff8b48 100644
--- a/cinder/files/backend/_hp_lefthand.conf
+++ b/cinder/files/backend/_hp_lefthand.conf
@@ -15,3 +15,5 @@
hplefthand_iscsi_chap_enabled={{ backend.iscsi_chap_enabled }}
hplefthand_debug=false
+
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_lvm.conf b/cinder/files/backend/_lvm.conf
index a0187e3..7123b92 100644
--- a/cinder/files/backend/_lvm.conf
+++ b/cinder/files/backend/_lvm.conf
@@ -18,3 +18,4 @@
target_helper = {{ backend.get('target_helper', backend.get('iscsi_helper', 'tgtadm')) }}
{%- endif %}
volume_group = {{ backend.volume_group }}
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_netapp.conf b/cinder/files/backend/_netapp.conf
index e342eb5..1825699 100644
--- a/cinder/files/backend/_netapp.conf
+++ b/cinder/files/backend/_netapp.conf
@@ -42,3 +42,4 @@
{%- if backend.goodness_function is defined %}
goodness_function={{ backend.goodness_function }}
{%- endif %}
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_nfs.conf b/cinder/files/backend/_nfs.conf
index 8d82497..56159c3 100644
--- a/cinder/files/backend/_nfs.conf
+++ b/cinder/files/backend/_nfs.conf
@@ -22,3 +22,4 @@
nfs_snapshot_support = {{ backend.nfs_snapshot_support }}
{%- endif %}
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_solidfire.conf b/cinder/files/backend/_solidfire.conf
index d954121..8ad70c3 100644
--- a/cinder/files/backend/_solidfire.conf
+++ b/cinder/files/backend/_solidfire.conf
@@ -17,3 +17,4 @@
{%- if backend.sf_account_prefix is defined %}
sf_account_prefix = {{ backend.sf_account_prefix }}
{%- endif %}
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
\ No newline at end of file
diff --git a/cinder/files/backend/_storwize.conf b/cinder/files/backend/_storwize.conf
index b7115a1..069cd68 100644
--- a/cinder/files/backend/_storwize.conf
+++ b/cinder/files/backend/_storwize.conf
@@ -13,4 +13,5 @@
storwize_svc_connection_protocol={{ backend.connection }}
#storwize_svc_iscsi_chap_enabled=true
storwize_svc_multihost_enabled={{ backend.multihost }}
-storwize_svc_multipath_enabled={{ backend.multipath }}
\ No newline at end of file
+storwize_svc_multipath_enabled={{ backend.multipath }}
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}
diff --git a/cinder/files/backend/_vmware.conf b/cinder/files/backend/_vmware.conf
index c1b8b72..a4871cc 100644
--- a/cinder/files/backend/_vmware.conf
+++ b/cinder/files/backend/_vmware.conf
@@ -122,3 +122,5 @@
{%- if backend.adapter_type is defined %}
vmware_adapter_type = {{ backend.adapter_type }}
{%- endif %}
+
+image_volume_cache_enabled={{ backend.get('image_volume_cache_enabled', False)|lower }}