[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 <Alexandru.Avadanii@enea.com>

3 files changed, 6 insertions, 4 deletions

diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2
index dbac901ca..82c4178b6 100644
--- a/mcp/scripts/docker-compose/docker-compose.yaml.j2
+++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2
@@ -31,7 +31,7 @@ services:
       - {{ conf.MCP_STORAGE_DIR }}/pki:/etc/pki
       - {{ conf.MCP_STORAGE_DIR }}/salt:/etc/salt
       - {{ conf.MCP_STORAGE_DIR }}/hosts:/etc/hosts
-{%- if conf.MCP_VCP %}
+{%- if conf.MCP_VCP or '-vcp-' in conf.MCP_DEPLOY_SCENARIO %}
       - {{ conf.MCP_STORAGE_DIR }}/base_image_opnfv_fuel_vcp.img:/srv/salt/env/prd/salt/files/control/images/base_image_opnfv_fuel_vcp.img
 {%- endif %}
     hostname: cfg01
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
-Subproject 917a71636a73cc72098d13ec32e52520cced823
+Subproject 94f99be1ddd263506231ec5b72b576a6c63d82c
diff --git a/mcp/scripts/xdf_data.sh.j2 b/mcp/scripts/xdf_data.sh.j2
index 30e41e95c..187f09296 100644
--- a/mcp/scripts/xdf_data.sh.j2
+++ b/mcp/scripts/xdf_data.sh.j2
@@ -34,7 +34,8 @@
   {%- set arr = [] -%}
   {%- for section in section_map -%}
     {%- for n in V.nodes[section] or [] -%}
-      {%- if conf.nodes[section_map[section] + loop.index0].node.type == 'virtual' -%}
+      {%- if ( section_map[section] < conf.nodes | length and
+               conf.nodes[section_map[section] + loop.index0].node.type == 'virtual' ) -%}
         {%- if n not in V -%}{%- do V.update({n: {}}) -%}{%- endif -%}
         {%- set cpu_topo = 'cpu_topology' in V[n] and not conf.MCP_CMP_SS -%}
         {%- if 'numa' in V[n] and cpu_topo -%}
@@ -61,7 +62,8 @@
   {%- set arr = [] -%}
   {%- for section in sections -%}
     {%- for n in V.nodes[section] or [] -%}
-      {%- if conf.nodes[section_map[section] + loop.index0].node.type in type -%}
+      {%- if ( section_map[section] < conf.nodes | length and
+               conf.nodes[section_map[section] + loop.index0].node.type in type ) -%}
         {%- do arr.append(n) -%}
       {%- endif -%}
     {%- endfor -%}
@@ -77,7 +79,7 @@
 {%- macro serialize_apt_pkg() -%}
   {%- set arr = [] -%}
   {%- set sections = [arch.common] -%}
-  {%- if conf.MCP_VCP -%}
+  {%- if conf.MCP_VCP or '-vcp-' in conf.MCP_DEPLOY_SCENARIO -%}
     {%- do sections.append(arch.control) -%}
   {%- endif -%}
   {%- for c in sections -%}