summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/config/scenario/os-nosdn-fdio-ha.yaml4
-rw-r--r--mcp/config/scenario/os-nosdn-fdio-noha.yaml12
-rw-r--r--mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch15
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j21
-rw-r--r--mcp/scripts/lib_template.sh10
6 files changed, 24 insertions, 19 deletions
diff --git a/mcp/config/scenario/os-nosdn-fdio-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
index 384771298..6415d0499 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: 8192
+ ram: 12288
cmp002:
disks: 100G;100G
vcpus: 4
- ram: 8192
+ ram: 12288
diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
index 187b5bf48..028f3132a 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: 8192
+ ram: 12288
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
- memory: 8388608
+ memory: 12582912
cpus: 0-7
cmp001:
disks: 100G;100G
vcpus: 8
- ram: 8192
+ ram: 12288
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
- memory: 8388608
+ memory: 12582912
cpus: 0-7
cmp002:
disks: 100G;100G
vcpus: 8
- ram: 8192
+ ram: 12288
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
- memory: 8388608
+ memory: 12582912
cpus: 0-7
diff --git a/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch b/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch
index 44883ae82..6c26ae864 100644
--- a/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch
+++ b/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch
@@ -17,10 +17,10 @@ TODO:
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- linux/files/vpp_commands.txt | 4 ++++
- linux/files/vpp_startup.conf | 44 ++++++++++++++++++++++++++++++++++++
- linux/network/dpdk.sls | 38 +++++++++++++++++++++++++++++++
- 3 files changed, 86 insertions(+)
+ linux/files/vpp_commands.txt | 4 +++
+ linux/files/vpp_startup.conf | 47 ++++++++++++++++++++++++++++++++++++
+ linux/network/dpdk.sls | 38 +++++++++++++++++++++++++++++
+ 3 files changed, 89 insertions(+)
create mode 100644 linux/files/vpp_commands.txt
create mode 100644 linux/files/vpp_startup.conf
@@ -36,10 +36,10 @@ index 0000000..2ce4726
+{%- endif %}
diff --git a/linux/files/vpp_startup.conf b/linux/files/vpp_startup.conf
new file mode 100644
-index 0000000..d66ecd3
+index 0000000..fcfc1fd
--- /dev/null
+++ b/linux/files/vpp_startup.conf
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,47 @@
+{%- from "linux/map.jinja" import network with context %}
+unix {
+ cli-listen /run/vpp/cli.sock
@@ -74,6 +74,9 @@ index 0000000..d66ecd3
+{%- endif %}
+}
+dpdk {
++{%- if network.vpp.decimal_interface_names is defined %}
++ decimal-interface-names
++{%- endif %}
+{%- if network.vpp.dpdk_socket_mem is defined %}
+ socket-mem {{ network.vpp.dpdk_socket_mem }}
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
index 084a88fec..b63555339 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
@@ -40,6 +40,7 @@ parameters:
driver: "${_param:compute_dpdk_driver}"
vpp:
enabled: true
+ decimal_interface_names: true
# Reuse ovs-dpdk socket mem configuration from IDF
dpdk_socket_mem: ${_param:compute_ovs_dpdk_socket_mem}
main_core: ${linux:system:kernel:isolcpu}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
index 23f4ed638..00d8fbd8c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
@@ -28,6 +28,7 @@ parameters:
{%- set floating_br_type = 'bridge' %}
vpp:
enabled: true
+ decimal_interface_names: true
# Reuse ovs-dpdk socket mem configuration from IDF
dpdk_socket_mem: ${_param:compute_ovs_dpdk_socket_mem}
main_core: ${linux:system:kernel:isolcpu}
diff --git a/mcp/scripts/lib_template.sh b/mcp/scripts/lib_template.sh
index b44702235..bec8e159e 100644
--- a/mcp/scripts/lib_template.sh
+++ b/mcp/scripts/lib_template.sh
@@ -47,11 +47,6 @@ function do_templates_scenario {
notify_e "[ERROR] IDF does not match yaml schema!"
fi
fi
- if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" \
- -i "$(dirname "$(readlink -f "${PHAROS_IA}")")" \
- -j "${PHAROS_IA}" -v > "${image_dir}/pod_config.yml"; then
- notify_e "[ERROR] Could not convert PDF+IDF to reclass model input!"
- fi
printenv | \
awk '/^(SALT|MCP|MAAS).*=/ { gsub(/=/,": "); print }' >> "${LOCAL_PDF}"
j2args=$(find "${scenario_dir}" -name '*.j2' -exec echo -j {} \;)
@@ -63,6 +58,11 @@ function do_templates_scenario {
for _yaml in "${extra_yaml[@]}"; do
awk '/^---$/{f=1;next;}f' "${_yaml}" >> "${LOCAL_PDF}"
done
+ if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" \
+ -i "$(dirname "$(readlink -f "${PHAROS_IA}")")" \
+ -j "${PHAROS_IA}" -v > "${image_dir}/pod_config.yml"; then
+ notify_e "[ERROR] Could not convert PDF+IDF to reclass model input!"
+ fi
}
# Expand reclass and virsh network templates based on PDF + IDF + others