From 648ec98613d31e3d9701b9ac1d87aed640b245f3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 28 Dec 2017 18:41:09 +0100 Subject: MaaS: preseed Armband repo via curtin Instead of installing upstream vanilla kernel from Ubuntu just to upgrade to the one from Armband repo later, preseed Armband repo config via curtin. This allows us to drop a kernel update cycle, thus saving a few minutes at each deploy. While at it, switch salt repo addition to use the maas region reclass section instead of adding a dedicated mechanism for it in the curtin template (only for arm64). JIRA: ARMBAND-280 Change-Id: Iad5953a7de80d728f11a4ce3113bd7725100c31c Signed-off-by: Alexandru Avadanii --- .../0013-glusterfs-Use-3.12-for-AArch64.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create 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 new file mode 100644 index 00000000..6949ce82 --- /dev/null +++ b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch @@ -0,0 +1,61 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 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/baremetal-mcp-pike-common-ha/infra/kvm.yml | 2 +- + .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 2 +- + .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +index 8c0fd73..24d5723 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +@@ -26,7 +26,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/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +index df23754..e3db1b0 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +@@ -35,7 +35,7 @@ parameters: + keepalived_vip_virtual_router_id: 69 + loopback_device_size: 20 + linux_system_codename: xenial +- glusterfs_version: '3.13' ++ glusterfs_version: '3.12' + glusterfs: + client: + volumes: +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml +index c332542..7a2288f 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml ++++ b/mcp/reclass/classes/cluster/baremetal-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' + nova: + controller: + pkgs: -- cgit 1.2.3-korg