diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-06 23:43:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-06 22:16:52 +0000 |
| commit | 0abdc6ec87ddaa396bb3069a67117e3f3bb6258c (patch) | |
| tree | bd4385bcf78db9747f41ae6189b674e8685db371 /patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch | |
| parent | 105252be000e08a7b32b162b1f4b610a99461c40 (diff) | |
u/fuel: Bump & rebase for ODL Oxygen
Drop obsolete patches:
- UCA arch list extension (upstream no longer enforces the arch);
Change-Id: I223964af674979f034a61aefff85c9f47af466d9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 13c73bfed1188a5e2c7355cf7eb5c5a1da006c22)
Diffstat (limited to 'patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch')
| -rw-r--r-- | patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch new file mode 100644 index 00000000..3432e857 --- /dev/null +++ b/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch @@ -0,0 +1,42 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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' |