Merge "Enable metadata proxy secret for Contrail"
diff --git a/README.rst b/README.rst
index f3c22f6..948f8ec 100644
--- a/README.rst
+++ b/README.rst
@@ -502,6 +502,16 @@
             address: 1.2.3.4
             port: 8776
 
+Define multipath for nova compute:
+
+.. code-block:: yaml
+
+    nova:
+      compute:
+        ....
+        libvirt:
+          volume_use_multipath: True
+
 Client role
 -----------
 
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 7578c00..aa774a7 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -6666,6 +6666,9 @@
 #  (boolean value)
 # Deprecated group/name - [libvirt]/iscsi_use_multipath
 #volume_use_multipath=false
+{%- if compute.libvirt.volume_use_multipath is defined %}
+volume_use_multipath={{ compute.libvirt.volume_use_multipath }}
+{%- endif %}
 
 #
 # Number of times to rediscover AoE target to find volume.
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 6c006aa..7781163 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -6714,6 +6714,9 @@
 #  (boolean value)
 # Deprecated group/name - [libvirt]/iscsi_use_multipath
 #volume_use_multipath=false
+{%- if compute.libvirt.volume_use_multipath is defined %}
+volume_use_multipath={{ compute.libvirt.volume_use_multipath }}
+{%- endif %}
 
 #
 # Number of times to rediscover AoE target to find volume.
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index bbe09c4..4b65b0f 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -7354,6 +7354,9 @@
 #  (boolean value)
 # Deprecated group/name - [libvirt]/iscsi_use_multipath
 #volume_use_multipath = false
+{%- if compute.libvirt.volume_use_multipath is defined %}
+volume_use_multipath={{ compute.libvirt.volume_use_multipath }}
+{%- endif %}
 
 #
 # Number of times to scan given storage protocol to find volume.