diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-04 00:59:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-04 23:26:17 +0000 |
| commit | 472aeddea5457cc84c403edd9d4ed8d193f64c40 (patch) | |
| tree | ecc5940b6a39abfac75ddd4a5a874a9048917b89 /patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch | |
| parent | 46040c0ab85aeba942b7ec7897b32243f859aac0 (diff) | |
p/fuel: Fix ga-16.04 MaaS kernel to be hwe-edge
While at it, bump & rebase for ODL VM memory bump & Pike staging PPA,
handle architecture list for pike-staging PPA.
Change-Id: I13cdeef0ae2167ff1b7e6dd9c188dfbdcf18d9a1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit da4a72b2ee47253ae763752254fbd049155d941e)
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 | 14 |
1 files changed, 13 insertions, 1 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 index 28388d41..3432e857 100644 --- 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 @@ -10,10 +10,12 @@ 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 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 @@ -28,3 +30,13 @@ index 226a4f66..a2987423 100644 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' |