Hugepage count has been recently bumped for virtual PODs via IDF
changes in Pharos, so align our FDio scenarios with the new RAM
requirements.
While at it, fix wrong pod_config template evaluation by moving it
after the templated scenario files are expanded, since pod_config
relies on scenario node definition.
Also, configure VPP to use decimal interface names by default to
align with Pharos macro for the VPP interface name string.
Change-Id: Ib3a89c294a3a2755567fdbe07e3be2b8ca1a5714
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
cmp001:
disks: 100G;100G
vcpus: 4
cmp001:
disks: 100G;100G
vcpus: 4
cmp002:
disks: 100G;100G
vcpus: 4
cmp002:
disks: 100G;100G
vcpus: 4
ram: 14336
gtw01:
vcpus: 8
ram: 14336
gtw01:
vcpus: 8
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
cpus: 0-7
cmp001:
disks: 100G;100G
vcpus: 8
cpus: 0-7
cmp001:
disks: 100G;100G
vcpus: 8
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
cpus: 0-7
cmp002:
disks: 100G;100G
vcpus: 8
cpus: 0-7
cmp002:
disks: 100G;100G
vcpus: 8
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
cpu_topology:
sockets: 1
cores: 4
threads: 2
numa:
cell0:
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
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
create mode 100644 linux/files/vpp_commands.txt
create mode 100644 linux/files/vpp_startup.conf
+{%- endif %}
diff --git a/linux/files/vpp_startup.conf b/linux/files/vpp_startup.conf
new file mode 100644
+{%- endif %}
diff --git a/linux/files/vpp_startup.conf b/linux/files/vpp_startup.conf
new file mode 100644
--- /dev/null
+++ b/linux/files/vpp_startup.conf
--- /dev/null
+++ b/linux/files/vpp_startup.conf
+{%- from "linux/map.jinja" import network with context %}
+unix {
+ cli-listen /run/vpp/cli.sock
+{%- from "linux/map.jinja" import network with context %}
+unix {
+ cli-listen /run/vpp/cli.sock
++{%- 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 %}
+{%- if network.vpp.dpdk_socket_mem is defined %}
+ socket-mem {{ network.vpp.dpdk_socket_mem }}
+{%- endif %}
driver: "${_param:compute_dpdk_driver}"
vpp:
enabled: true
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}
# Reuse ovs-dpdk socket mem configuration from IDF
dpdk_socket_mem: ${_param:compute_ovs_dpdk_socket_mem}
main_core: ${linux:system:kernel:isolcpu}
{%- set floating_br_type = 'bridge' %}
vpp:
enabled: true
{%- 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}
# Reuse ovs-dpdk socket mem configuration from IDF
dpdk_socket_mem: ${_param:compute_ovs_dpdk_socket_mem}
main_core: ${linux:system:kernel:isolcpu}
notify_e "[ERROR] IDF does not match yaml schema!"
fi
fi
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 {} \;)
printenv | \
awk '/^(SALT|MCP|MAAS).*=/ { gsub(/=/,": "); print }' >> "${LOCAL_PDF}"
j2args=$(find "${scenario_dir}" -name '*.j2' -exec echo -j {} \;)
for _yaml in "${extra_yaml[@]}"; do
awk '/^---$/{f=1;next;}f' "${_yaml}" >> "${LOCAL_PDF}"
done
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
}
# Expand reclass and virsh network templates based on PDF + IDF + others