diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-06 07:39:38 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-06 07:39:38 +0200 |
| commit | 650b581cfb03cdd723541ec41ff3530391e4c76e (patch) | |
| tree | 64858ca30a7aa868a2e62b0cb6056a3f32e2f40a /patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch | |
| parent | b327d829cdb20a81c63f4039ee7c9950be66ed80 (diff) | |
p/fuel: Bump GlusterFS to 3.13 (was 3.12)
GlusterFS PPA now has arm64 binaries for 3.13, use them to drop one
more patch and align with Fuel@OPNFV.
Change-Id: I0769d6c3f34bb880fcd8f5ed70b0c2bf561d450a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch')
| -rw-r--r-- | patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch deleted file mode 100644 index 3432e857..00000000 --- a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch +++ /dev/null @@ -1,42 +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 <Alexandru.Avadanii@enea.com> -Date: Mon, 22 Jan 2018 19:41:37 +0100 -Subject: [PATCH] Revert "Get back to the GA kernel" - -This partially reverts commit b3b4b2e1bcd42f4628e53796c3dab81151f56bc2 -This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450. ---- - mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 +- - mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml -index 226a4f66..a2987423 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml -@@ -25,7 +25,7 @@ parameters: - maas_db_password: opnfv_secret - dns_server01: ${_param:opnfv_dns_server01} - single_address: ${_param:infra_maas_node01_deploy_address} -- hwe_kernel: 'hwe-16.04' -+ hwe_kernel: 'hwe-16.04-edge' - maas: - region: - salt_master_ip: ${_param:reclass_config_master} -diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml -index 6662f1fa..be18e212 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml -@@ -11,4 +11,4 @@ classes: - - cluster.mcp-pike-odl-ha.infra - parameters: - _param: -- hwe_kernel: 'ga-16.04' -+ hwe_kernel: 'hwe-16.04-edge' |