Browse Source
Fixing dpdk disabled case for pillars with ovs_dpdk_port
Prod-Related: EME-405 Change-Id: Id9a8ebefb227c4b0a99d8cdd955c39401720bbeepull/138/merge
Dzmitry Stremkouski
6 years ago
1 changed files with 3 additions and 2 deletions
+ 3
- 2
linux/network/interface.sls
View File
| {%- from "linux/map.jinja" import system with context %} | {%- from "linux/map.jinja" import system with context %} | ||||
| {%- if network.enabled %} | {%- if network.enabled %} | ||||
| {%- if network.get('dpdk', {}).get('enabled', False) %} | |||||
| {%- set dpdk_enabled = network.get('dpdk', {}).get('enabled', False) %} | |||||
| {%- if dpdk_enabled %} | |||||
| include: | include: | ||||
| - linux.network.dpdk | - linux.network.dpdk | ||||
| {%- endif %} | {%- endif %} | ||||
| - name: {{ interface_name }} | - name: {{ interface_name }} | ||||
| - bridge: {{ interface.bridge }} | - bridge: {{ interface.bridge }} | ||||
| - require: | - require: | ||||
| {%- if network.interface.get(interface.bridge, {}).get('type', 'ovs_bridge') == 'dpdk_ovs_bridge' %} | |||||
| {%- if dpdk_enabled and network.interface.get(interface.bridge, {}).get('type', 'ovs_bridge') == 'dpdk_ovs_bridge' %} | |||||
| - cmd: linux_network_dpdk_bridge_interface_{{ interface.bridge }} | - cmd: linux_network_dpdk_bridge_interface_{{ interface.bridge }} | ||||
| {%- else %} | {%- else %} | ||||
| - openvswitch_bridge: ovs_bridge_{{ interface.bridge }} | - openvswitch_bridge: ovs_bridge_{{ interface.bridge }} |
Loading…