patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.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: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Fri, 15 Dec 2017 19:57:46 +0100
  11 Subject: [PATCH] glusterfs: Use 3.12 for AArch64
  12
  13 Currently, the glusterfs PPA for 3.13 does not have arm64 binaries,
  14 so stick to 3.12 for now.
  15
  16 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  17 ---
  18  mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml            | 2 +-
  19  mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml    | 2 +-
  20  mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
  21  3 files changed, 3 insertions(+), 3 deletions(-)
  22
  23 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
  24 index 84b392e6..1209f312 100644
  25 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
  26 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
  27 @@ -28,7 +28,7 @@ classes:
  28  parameters:
  29    _param:
  30      linux_system_codename: xenial
  31 -    glusterfs_version: '3.13'
  32 +    glusterfs_version: '3.12'
  33      cluster_vip_address: ${_param:infra_kvm_address}
  34      cluster_node01_address: ${_param:infra_kvm_node01_address}
  35      cluster_node02_address: ${_param:infra_kvm_node02_address}
  36 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
  37 index a6c3d9ed..d730c935 100644
  38 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
  39 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
  40 @@ -34,7 +34,7 @@ parameters:
  41      keepalived_vip_interface: br-ctl
  42      keepalived_vip_virtual_router_id: 69
  43      linux_system_codename: xenial
  44 -    glusterfs_version: '3.13'
  45 +    glusterfs_version: '3.12'
  46    glusterfs:
  47      client:
  48        volumes:
  49 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
  50 index c487e342..62c1ab28 100644
  51 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
  52 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
  53 @@ -66,7 +66,7 @@ parameters:
  54      cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
  55      cluster_node03_address: ${_param:openstack_control_node03_address}
  56      nova_vncproxy_url: https://${_param:cluster_public_host}:6080
  57 -    glusterfs_version: '3.13'
  58 +    glusterfs_version: '3.12'
  59  {%- if conf.MCP_VCP %}
  60    heat:
  61      server: