Fixing dpdk disabled case for pillars with ovs_dpdk_port
Prod-Related: EME-405
Change-Id: Id9a8ebefb227c4b0a99d8cdd955c39401720bbee
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index c2d2a23..a39fc37 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -2,7 +2,8 @@
{%- from "linux/map.jinja" import system with context %}
{%- if network.enabled %}
-{%- if network.get('dpdk', {}).get('enabled', False) %}
+{%- set dpdk_enabled = network.get('dpdk', {}).get('enabled', False) %}
+{%- if dpdk_enabled %}
include:
- linux.network.dpdk
{%- endif %}
@@ -117,7 +118,7 @@
- name: {{ interface_name }}
- bridge: {{ interface.bridge }}
- 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 }}
{%- else %}
- openvswitch_bridge: ovs_bridge_{{ interface.bridge }}