From 2ec48942a22cb2de425bf89ad242a5726475b4cb Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 25 Feb 2018 03:54:45 +0100 Subject: u/fuel: Bump & rebase for compute parameterization While at it, enable hugepages on AArch64 by removing the patch that used to disable them. JIRA: ARMBAND-341 Change-Id: I8f5e8bbceeaa2c99a983a14d9c03da497eec64c4 Signed-off-by: Alexandru Avadanii Signed-off-by: Cristina Pauna --- .../0013-glusterfs-Use-3.12-for-AArch64.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch (limited to 'patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch') diff --git a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch deleted file mode 100644 index ce3ccb88..00000000 --- a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch +++ /dev/null @@ -1,61 +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: Alexandru Avadanii -Date: Fri, 15 Dec 2017 19:57:46 +0100 -Subject: [PATCH] glusterfs: Use 3.12 for AArch64 - -Currently, the glusterfs PPA for 3.13 does not have arm64 binaries, -so stick to 3.12 for now. - -Signed-off-by: Alexandru Avadanii ---- - mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 2 +- - mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 2 +- - mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -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 -index 84b392e..1209f31 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml -@@ -28,7 +28,7 @@ classes: - parameters: - _param: - linux_system_codename: xenial -- glusterfs_version: '3.13' -+ glusterfs_version: '3.12' - cluster_vip_address: ${_param:infra_kvm_address} - cluster_node01_address: ${_param:infra_kvm_node01_address} - cluster_node02_address: ${_param:infra_kvm_node02_address} -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 -index 407751f..b0e23d0 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -@@ -35,7 +35,7 @@ parameters: - keepalived_vip_interface: br-ctl - keepalived_vip_virtual_router_id: 69 - linux_system_codename: xenial -- glusterfs_version: '3.13' -+ glusterfs_version: '3.12' - glusterfs: - client: - volumes: -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml -index b08f3c2..84d35be 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml -@@ -38,7 +38,7 @@ parameters: - cluster_node03_hostname: ${_param:openstack_control_node03_hostname} - cluster_node03_address: ${_param:openstack_control_node03_address} - nova_vncproxy_url: https://${_param:cluster_public_host}:6080 -- glusterfs_version: '3.13' -+ glusterfs_version: '3.12' - heat: - server: - metadata: -- cgit 1.2.3-korg