From 7a31d776d4bdf122d4c4c8f732304cc83621bdd6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 11 Feb 2019 11:04:59 +0000 Subject: [akraino] Add IEC K8-calico scenarios - bump Pharos git submodule to allow PODs with fewer nodes; - add `k8-calico-iec-noha` scenario definition for Akraino IEC basic configuration; - add `k8-calico-iec-vcp-noha` scenario definition for Akraino IEC nested (virtualized control plane) configuration; - add `akraino_iec` state, which will leverage the Akraino IEC bootstrap scripts from [1]; - replace system.reboot salt call with cmd.run 'reboot' as it's more reliable; - use kernel 4.15 for AArch64 K8 IEC scenarios; NOTE: These scenarios will not be released in OPNFV since don't rely on Salt formulas but instead of Akraino IEC scripts to install K8s. [1] https://gerrit.akraino.org/r/#/q/project:iec Change-Id: I4e538e0563d724cd3fd5c4d462ddc22d0c739402 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common') diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 index f62caa2bf..489a22fd4 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 @@ -41,6 +41,7 @@ parameters: storage: data_source: engine: local +{%- if nm.cmp_nodes > 0 %} node: # We support per-node (not only per-role) compute configuration via IDF {%- for cmp in range(1, nm.cmp_nodes + 1) %} @@ -111,3 +112,4 @@ parameters: {%- endif %} {%- endif %} {%- endfor %} +{%- endif %} -- cgit 1.2.3-korg