Merge "Extending txqueuelen param for linux.network" into release/2019.2.0
diff --git a/README.rst b/README.rst
index 4994fa7..979b077 100644
--- a/README.rst
+++ b/README.rst
@@ -2222,6 +2222,12 @@
br-prv:
enabled: true
type: dpdk_ovs_bridge
+ br-floating:
+ enabled: true
+ type: ovs_bridge
+ name_servers:
+ - 1.1.1.1
+ - 9.9.9.9
**DPDK OVS Bond**
diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
index fa37f5a..fec5e16 100644
--- a/linux/files/ovs_bridge
+++ b/linux/files/ovs_bridge
@@ -8,3 +8,6 @@
{%- if bridge.gateway is defined %}
gateway {{ bridge.gateway }}
{%- endif %}
+{%- if bridge.name_servers is defined %}
+dns-nameservers {{ bridge.name_servers|join(' ') }}
+{%- endif %}
diff --git a/linux/files/ovs_port b/linux/files/ovs_port
index 546ec1e..8377e48 100644
--- a/linux/files/ovs_port
+++ b/linux/files/ovs_port
@@ -1,6 +1,9 @@
auto {{ port_name }}
allow-{{ port.bridge }} {{ port_name }}
iface {{ port_name }} inet {{ port.get('proto', 'manual') }}
+{%- if '.' in port_name %}
+vlan-raw-device {{ port_name.split('.')[0] }}
+{%- endif %}
ovs_type {{ port.get('ovs_port_type', 'OVSIntPort') }}
mtu {{ port.get('mtu', '1500') }}
ovs_bridge {{ port.bridge }}