One should be able to change ovs port type if its not virtual.
If ovs port is virtual, we use OVSIntPort to create it.
Otherwise it should be OVSPort.
I've added new key: ovs_port_type to not intersect with current
deployments and not hurt anyone.
I've updated doc to have an example of ovs peering patch.
Customer-Found
Change-Id: Ieddb5fcc02d410c3cc14c89737992690cb5f3975
diff --git a/README.rst b/README.rst
index f62a937..a4d5323 100644
--- a/README.rst
+++ b/README.rst
@@ -907,6 +907,44 @@
netmask: 255.255.255.0
use_interfaces:
- eth1
+ br-prv:
+ enabled: true
+ type: ovs_bridge
+ mtu: 65000
+ br-ens7:
+ enabled: true
+ name: br-ens7
+ type: ovs_bridge
+ proto: manual
+ mtu: 9000
+ use_interfaces:
+ - ens7
+ patch-br-ens7-br-prv:
+ enabled: true
+ name: ens7-prv
+ ovs_type: ovs_port
+ type: ovs_port
+ bridge: br-ens7
+ port_type: patch
+ peer: prv-ens7
+ mtu: 65000
+ patch-br-prv-br-ens7:
+ enabled: true
+ name: prv-ens7
+ bridge: br-prv
+ ovs_type: ovs_port
+ type: ovs_port
+ port_type: patch
+ peer: ens7-prv
+ mtu: 65000
+ ens7:
+ enabled: true
+ name: ens7
+ proto: manual
+ ovs_port_type: OVSPort
+ type: ovs_port
+ ovs_bridge: br-ens7
+ bridge: br-ens7
Debian manual proto interfaces
diff --git a/linux/files/ovs_port b/linux/files/ovs_port
index 1c807ca..222ca8e 100644
--- a/linux/files/ovs_port
+++ b/linux/files/ovs_port
@@ -1,7 +1,7 @@
auto {{ port_name }}
allow-{{ port.bridge }} {{ port_name }}
iface {{ port_name }} inet {{ port.get('proto', 'manual') }}
-ovs_type OVSIntPort
+ovs_type {{ port.get('ovs_port_type', 'OVSIntPort') }}
mtu {{ port.get('mtu', '1500') }}
ovs_bridge {{ port.bridge }}
{%- if port.get('proto', 'manual') == 'static' %}
diff --git a/tests/pillar/network_openvswitch_dpdk.sls b/tests/pillar/network_openvswitch_dpdk.sls
index 73623d6..fa96cb9 100644
--- a/tests/pillar/network_openvswitch_dpdk.sls
+++ b/tests/pillar/network_openvswitch_dpdk.sls
@@ -39,3 +39,11 @@
br-prv:
enabled: true
type: dpdk_ovs_bridge
+ dummy0:
+ enabled: true
+ name: dummy0
+ proto: manual
+ ovs_port_type: OVSIntPort
+ type: ovs_port
+ ovs_bridge: br-prv
+ bridge: br-prv