summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-12-29 19:28:47 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-12-29 19:56:19 +0100
commitba145df1e68b41af007f648ff3fb9c6f500e27cd (patch)
tree298534a5414975e3ebf2803ee639983d3a384984 /config
parent5d4ef7d76f44757855c24376dce683b9129a3351 (diff)
[IDF] fuel, dpdk: Switch to 1G pgsz on ThunderX
VPP requires 1G pagesizes on ThunderX nodes, so switch from 2M to 1G when DPDK is used. While at it, extend the Fuel j2 macro to accomodate different naming of virtual function network devices based on the driver used (vfio). Change-Id: Ic29ce04867955282b6f988ed69a44b316ffdc994 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'config')
-rw-r--r--config/installers/fuel/net_macros.j214
1 files changed, 9 insertions, 5 deletions
diff --git a/config/installers/fuel/net_macros.j2 b/config/installers/fuel/net_macros.j2
index a7cf3e57..ad26a79c 100644
--- a/config/installers/fuel/net_macros.j2
+++ b/config/installers/fuel/net_macros.j2
@@ -36,10 +36,14 @@
{{ nic }}{% if vlan | int > 0 %}.{{ vlan }}{% endif %}
{%- endmacro -%}
-{%- macro vpp_interface_str(speed, pci_addr) -%}
+{%- macro vpp_interface_str(speed, pci_addr, driver = '') -%}
{%- set p = pci_addr.replace('.', ':').split(':') -%}
- {%- set s = 'GigabitEthernet%d/%d/%d' | format(p[-3] | int(0, 16),
- p[-2] | int(0, 16),
- p[-1] | int(0, 16)) -%}
- {% if '40g' in speed %}Forty{% elif '10g' in speed %}Ten{% endif %}{{ s }}
+ {%- set s = 'Ethernet%d/%d/%d' | format(p[-3] | int(0, 16),
+ p[-2] | int(0, 16),
+ p[-1] | int(0, 16)) -%}
+ {%- if 'vfio' in driver -%}
+ VirtualFunction{{ s }}
+ {%- else -%}
+ {% if '40g' in speed %}Forty{% elif '10g' in speed %}Ten{% endif %}Gigabit{{ s }}
+ {%- endif -%}
{%- endmacro -%}