Make volumes appear as SCSI devices in aarch64

Adding volumes in openstack by default uses virtio_blk and the
devices appear as /dev/vdX. In aarch64 however a qemu pci slot
is already in use so the tests cannot assign more than one volume
to a VM. Forcing the drives to use virtio-scsi solves the issue
and allows more volumes to be attached as /dev/sdX. The variable
defining the drive is VOLUME_DEVICE_NAME and is passed as
environmental variable when the container is created.

JIRA: ARMBAND-376

Change-Id: Ia688cff338ff319e22a3b26796fa197297c23ce0
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit a663c33645681f66ebe6b6af79c4e9f5910fb26b)

diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index a87fe25..2f1289c 100644 (file)
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -9,6 +9,8 @@ os:
                 hw_firmware_type: 'uefi'
                 hw_video_model: 'vga'
                 short_id: 'ubuntu16.04'
+                hw_disk_bus: 'scsi'
+                hw_scsi_model: 'virtio-scsi'
     snaps:
         images:
             glance_tests:
@@ -18,6 +20,8 @@ os:
                     hw_firmware_type: 'uefi'
                     short_id: 'ubuntu16.04'
                     hw_video_model: 'vga'
+                    hw_disk_bus: 'scsi'
+                    hw_scsi_model: 'virtio-scsi'
             cirros:
                 disk_file:
                     /home/opnfv/functest/images/cirros-d161201-aarch64-disk.img
@@ -25,12 +29,16 @@ os:
                     hw_firmware_type: 'uefi'
                     short_id: 'ubuntu16.04'
                     hw_video_model: 'vga'
+                    hw_disk_bus: 'scsi'
+                    hw_scsi_model: 'virtio-scsi'
             ubuntu:
                 disk_file:
                     /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-arm64-uefi1.img
                 extra_properties:
                     hw_firmware_type: 'uefi'
                     hw_video_model: 'vga'
+                    hw_disk_bus: 'scsi'
+                    hw_scsi_model: 'virtio-scsi'
             centos:
                 disk_file:
                     /home/opnfv/functest/images/CentOS-7-aarch64-GenericCloud.qcow2