patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Charalampos Kominos <Charalampos.Kominos@enea.com>
  10 Date: Fri, 27 Apr 2018 14:54:22 +0200
  11 Subject: [PATCH] Set volume name in source file to sdX
  12
  13 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
  14 ---
  15  .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
  16  .../classes/cluster/mcp-pike-common-noha/openstack_control.yml  | 2 +-
  17  2 files changed, 2 insertions(+), 2 deletions(-)
  18
  19 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
  20 index 599c48e8..018253bb 100644
  21 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
  22 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
  23 @@ -130,7 +130,7 @@ parameters:
  24      server:
  25        cacert: /etc/ssl/certs/mcp_os_cacert
  26        openrc_extra:
  27 -        volume_device_name: vdc
  28 +        volume_device_name: sdc
  29    bind:
  30      server:
  31        control:
  32 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
  33 index 29b2d627..3a994b8d 100644
  34 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
  35 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
  36 @@ -71,7 +71,7 @@ parameters:
  37      server:
  38        admin_email: ${_param:admin_email}
  39        openrc_extra:
  40 -        volume_device_name: vdc
  41 +        volume_device_name: sdc
  42        pkgs:
  43          - keystone
  44          - python-psycopg2