aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mcp/config/scenario/defaults.yaml.j24
-rw-r--r--mcp/config/scenario/os-nosdn-fdio-ha.yaml4
-rw-r--r--mcp/config/scenario/os-nosdn-fdio-noha.yaml12
3 files changed, 12 insertions, 8 deletions
diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2
index 1e5cd6ed0..cd5cb04cd 100644
--- a/mcp/config/scenario/defaults.yaml.j2
+++ b/mcp/config/scenario/defaults.yaml.j2
@@ -33,7 +33,9 @@ x86_64:
- saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main
pkg:
install:
+ {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO %}
- linux-generic-hwe-18.04
+ {%- endif %}
- salt-minion
- ifupdown
- cloud-init
@@ -97,7 +99,9 @@ aarch64:
- saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main
pkg:
install:
+ {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO %}
- linux-generic-hwe-18.04
+ {%- endif %}
- salt-minion
- ifupdown
- cloud-init
diff --git a/mcp/config/scenario/os-nosdn-fdio-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
index 6415d0499..b010f7ab6 100644
--- a/mcp/config/scenario/os-nosdn-fdio-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
@@ -40,8 +40,8 @@ virtual:
cmp001:
disks: 100G;100G
vcpus: 4
- ram: 12288
+ ram: 14336
cmp002:
disks: 100G;100G
vcpus: 4
- ram: 12288
+ ram: 14336
diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
index 028f3132a..64b4aaf57 100644
--- a/mcp/config/scenario/os-nosdn-fdio-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
@@ -25,36 +25,36 @@ virtual:
ram: 14336
gtw01:
vcpus: 8
- ram: 12288
+ ram: 14336
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
- memory: 12582912
+ memory: 14680064
cpus: 0-7
cmp001:
disks: 100G;100G
vcpus: 8
- ram: 12288
+ ram: 14336
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
- memory: 12582912
+ memory: 14680064
cpus: 0-7
cmp002:
disks: 100G;100G
vcpus: 8
- ram: 12288
+ ram: 14336
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
- memory: 12582912
+ memory: 14680064
cpus: 0-7