summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-24 16:18:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-24 16:18:20 +0000
commit8a5df5e7f886cfa27260d62a963fb0cb60d346ff (patch)
tree33d4946572e39ffe19027b371937daba1ed52140
parentf29966ddead2ba5f97d385108e19d1889cc7b48e (diff)
parent931141e84500695b4a278cc04888b603749a8303 (diff)
Merge "AArch64: Switch back to hwe-16.04 kernel"
-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 %}