diff options
| author |   Charalampos Kominos <Charalampos.Kominos@enea.com> | 2018-04-27 15:29:41 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-09 15:28:17 +0000 |
| commit | 07b5b7fe6428aa3adfc15e9d4a9232b13057f5e3 (patch) | |
| tree | bbb3b16b5f52cb549082ea9f6b5620b447d2225a /patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch | |
| parent | 2b0ac4026a3acf3b10ab2f4c416636d80ab559f0 (diff) | |
p/fuel: Set volume name in source file to sdX
By default the openstack virtual machines use virtio_blk. That causes
certain tests in functest to fail to attach the proper number of disks.
The solution is to switch to scsi disks for which we must also generate
the proper openstack source file.
JIRA: ARMBAND-376
Change-Id: I99a4073c24f13f1eb3798b2b07cb2c16ec3688cf
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit 8d1e8e56a48bc56265046b6410798dec2711d6de)
Diffstat (limited to 'patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch')
| -rw-r--r-- | patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch new file mode 100644 index 00000000..5febf93c --- /dev/null +++ b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch @@ -0,0 +1,44 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Charalampos Kominos <Charalampos.Kominos@enea.com> +Date: Fri, 27 Apr 2018 14:54:22 +0200 +Subject: [PATCH] Set volume name in source file to sdX + +Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> +--- + .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +- + .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +index 6f7b33e3..dfc212e2 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +@@ -139,7 +139,7 @@ parameters: + server: + cacert: /etc/ssl/certs/mcp_os_cacert + openrc_extra: +- volume_device_name: vdc ++ volume_device_name: sdc + bind: + server: + control: +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +index 01b32097..1b970412 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +@@ -57,7 +57,7 @@ parameters: + server: + admin_email: ${_param:admin_email} + openrc_extra: +- volume_device_name: vdc ++ volume_device_name: sdc + glance: + server: + storage: |