From 480a5696b52818a4a954b6cdaa4298b1c5835ff9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 23 May 2018 20:49:38 +0200 Subject: AArch64: Switch back to hwe-16.04 kernel Align kernel versions across architectures (where possible). Change-Id: I66a822611eb5e46f90b62f5d36df571ae75dcba3 Signed-off-by: Alexandru Avadanii (cherry picked from commit 931141e84500695b4a278cc04888b603749a8303) --- mcp/config/scenario/defaults.yaml | 3 +-- .../classes/cluster/mcp-pike-odl-ha/infra/maas.yml | 14 -------------- .../cluster/mcp-pike-odl-ha/infra/maas.yml.j2 | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml create mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml index 110ffc704..6affc7da6 100644 --- a/mcp/config/scenario/defaults.yaml +++ b/mcp/config/scenario/defaults.yaml @@ -43,8 +43,7 @@ aarch64: - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main pkg: install: - - linux-image-generic-hwe-16.04-edge - - linux-headers-generic-hwe-16.04-edge + - linux-generic-hwe-16.04 - python-futures - salt-minion control: 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 deleted file mode 100644 index 6662f1fad..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., 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 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-odl-ha.infra -parameters: - _param: - hwe_kernel: 'ga-16.04' diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 new file mode 100644 index 000000000..153b493ce --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 @@ -0,0 +1,22 @@ +############################################################################## +# Copyright (c) 2018 Mirantis Inc., 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 +############################################################################## +{%- set cluster_arch = [] %} +{%- for node in conf.nodes %} + {%- if node.node.arch not in cluster_arch %} + {%- do cluster_arch.append(node.node.arch) %} + {%- endif %} +{%- endfor %} +--- +classes: + - cluster.mcp-pike-common-ha.infra.maas + - cluster.mcp-pike-odl-ha.infra +{%- if 'aarch64' not in cluster_arch %} +parameters: + _param: + hwe_kernel: 'ga-16.04' +{%- endif %} -- cgit 1.2.3-korg