commit 512e765aeeb1e7feaac44a3dec8deea527620407
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Feb 28 16:54:32 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Feb 28 16:54:32 2019 +0000
tree 75a9a20b3d65a2a6249e3f4f47a8b360b734509a
parent 72bb88d65a05f63536dbe0c73b7ebee647a001f4
parent d3378db6f3450a809998b26ea5ce85dc6d529fe0

Merge "Extend interfaces file of ovs bridge/port"

README.rst

diff --git a/README.rst b/README.rst
index 2993b55..f8ad216 100644
--- a/README.rst
+++ b/README.rst
@@ -1942,6 +1942,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**
 

linux/files/ovs_bridge

diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
index f9bef19..e51b676 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 %}

linux/files/ovs_port

diff --git a/linux/files/ovs_port b/linux/files/ovs_port
index a55b821..20c256c 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 }}