Set volume device name to sdc

Functest is now using scsi volume type for fuel
Set correct volume device name for functest volume tests

JIRA: ARMBAND-402

Change-Id: I2265901eeb624a395388f6ce8afae226b129c5be
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
(cherry picked from commit f7f3623807c6ff914b28e89b157e3c9e3578d507)

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 25521f9..03610a6 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -92,7 +92,7 @@ parameters:
       <<: *db_conn_recycle_time
       cacert: /etc/ssl/certs/mcp_os_cacert
       openrc_extra:
-        volume_device_name: vdc
+        volume_device_name: sdc
   glance:
     server:
       <<: *db_conn_recycle_time

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index d1caafe..2f7e39d 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -85,7 +85,7 @@ parameters:
     server:
       admin_email: ${_param:admin_email}
       openrc_extra:
-        volume_device_name: vdc
+        volume_device_name: sdc
       pkgs:
         - keystone
         - python-psycopg2