diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-23 19:29:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-24 17:28:06 +0000 |
| commit | 1e6be0b7a685fe5c3575bb49843dfa1a12c071fd (patch) | |
| tree | 846f758d0791de6de25494415542081ad040ff0e /patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch | |
| parent | e3cffc6ebd73510294a4e7db9c4c25d01738ed73 (diff) | |
u/fuel: Bump & rebase for maas.machines.storage
Change-Id: I22781c20f353a81e546b1d6de390e6c58b31a494
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0bd1adfbf11d58414b96d0277386b039a3117a9e)
Diffstat (limited to 'patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch deleted file mode 100644 index f570a9bf..00000000 --- a/patches/opnfv-fuel/0008-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 238ae95a..3cdb8bf0 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' |