aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-25 17:10:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-25 17:10:21 +0000
commitf63c58f98b6ddbf64f300ed0495be3dd88e242e0 (patch)
treef53f4eace401904f42a964824a8866f3f7e15c13 /mcp
parente6685124258ed9d1237acf9d8b383c07f1397f93 (diff)
parent480a5696b52818a4a954b6cdaa4298b1c5835ff9 (diff)
Merge "AArch64: Switch back to hwe-16.04 kernel" into stable/fraser
Diffstat (limited to 'mcp')
-rw-r--r--mcp/config/scenario/defaults.yaml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml)8
2 files changed, 9 insertions, 2 deletions
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.j2
index 6662f1fad..153b493ce 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.j2
@@ -5,10 +5,18 @@
# 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 %}