diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-02-11 11:04:59 +0000 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-03-29 15:04:14 +0100 |
commit | 7a31d776d4bdf122d4c4c8f732304cc83621bdd6 (patch) | |
tree | 20acf2b9278434be4c94b3fa93d186386c1be1cb /mcp/scripts/docker-compose/docker-compose.yaml.j2 | |
parent | d7f96d14441eafda776d3c6475b8b0d93d91de39 (diff) |
[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>
Diffstat (limited to 'mcp/scripts/docker-compose/docker-compose.yaml.j2')
-rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 |
1 files changed, 1 insertions, 1 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 |