Merge "Cinder backup fails due to absent multipath tools" into stable/yoga

Author: Zuul

docker/cinder/cinder-backup/Dockerfile.j2

@@ -10,22 +10,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
         {% set cinder_backup_packages = [
+                'device-mapper-multipath',
                 'nfs-utils'
         ] %}
     {% elif base_package_type == 'deb' %}
         {% set cinder_backup_packages = [
                 'cinder-backup',
+                'multipath-tools',
                 'nfs-common'
         ] %}
     {% endif %}
 
 {% elif install_type == 'source' %}
     {% if base_package_type == 'rpm' %}
         {% set cinder_backup_packages = [
+                'device-mapper-multipath',
                 'nfs-utils'
         ] %}
      {% elif base_package_type == 'deb' %}
         {% set cinder_backup_packages = [
+                'multipath-tools',
                 'nfs-common'
         ] %}
     {% endif %}