diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-10-16 17:41:23 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-10-17 13:39:03 +0000 |
| commit | 9d074f2b11cfc5425c43539ca16f213bede143a4 (patch) | |
| tree | 0440d0d606d24c33a586fbbefb81ae2e1d18b2e5 | |
| parent | d13f5b9dd31fceaec93d5243b66515c3bff31426 (diff) | |
p/fuel: Remove volume name patch (upstream)
Change-Id: I094d5fe8224e620aff6e281281a45893a0ef10de
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 66db388e02fa09d6a233ed8844a6c91494cf2796)
| -rw-r--r-- | patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch deleted file mode 100644 index 06dc3645..00000000 --- a/patches/opnfv-fuel/0001-Set-volume-name-in-source-file-to-sdX.patch +++ /dev/null @@ -1,44 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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-common-ha/openstack_control.yml.j2 | 2 +- - .../classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -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 413b3737..c1414a95 100644 ---- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 -+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 -@@ -90,7 +90,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 d1caafe4..2f7e39d8 100644 ---- 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 |