Add support for OVS patch ports

OVS patch ports are used to connect two OVS bridges so traffic can flow
between them. This is generally useful for various cases.

Specifically it could be used to connect the bridges created by TripleO
networking configurations (br-ex, etc) to the bridge created by the
multinode networking setup in infra's nodepool (br_pub). This allows the
nodes in a multinode deployment to have connectivity across private
subnets where such traffic is typically firewalled off in public clouds.

Change-Id: I11404106cb3f53734f6fc9a35c22f905a0770245

2 files changed, 60 insertions, 0 deletions

diff --git a/etc/os-net-config/samples/ovs_patch_port.json b/etc/os-net-config/samples/ovs_patch_port.json
new file mode 100644
index 0000000..d457371
--- /dev/null
+++ b/etc/os-net-config/samples/ovs_patch_port.json
@@ -0,0 +1,37 @@
+{
+  "network_config": [
+    {
+      "name": "br-ctlplane",
+      "type": "ovs_bridge",
+      "members": [
+        {
+          "mtu": 1500,
+          "primary": "true",
+          "name": "eth1",
+          "type": "interface"
+        }
+      ],
+      "ovs_extra": [
+        "br-set-external-id br-ctlplane bridge-id br-ctlplane"
+      ],
+      "mtu": 1500,
+      "addresses": [
+        {
+          "ip_netmask": "192.0.2.1/24"
+        }
+      ]
+    },
+    {
+      "name": "br_pub-patch",
+      "type": "ovs_patch_port",
+      "bridge_name": "br-ctlplane",
+      "peer": "br-ctlplane-patch"
+    },
+    {
+      "name": "br-ctlplane-patch",
+      "type": "ovs_patch_port",
+      "bridge_name": "br_pub",
+      "peer": "br_pub-patch"
+    }
+  ]
+}
diff --git a/etc/os-net-config/samples/ovs_patch_port.yaml b/etc/os-net-config/samples/ovs_patch_port.yaml
new file mode 100644
index 0000000..91858be
--- /dev/null
+++ b/etc/os-net-config/samples/ovs_patch_port.yaml
@@ -0,0 +1,23 @@
+network_config:
+  -
+    type: ovs_bridge
+    name: br-ctlplane
+    mtu: 1500
+    members:
+      -
+        type: interface
+        name: eth1
+        # force the MAC address of the bridge to this interface
+        primary: true
+        mtu: 1500
+    ovs_extra: "br-set-external-id br-ctlplane bridge-id br-ctlplane"
+  -
+    type: ovs_patch_port
+    name: br_pub-patch
+    bridge_name: br-ctlplane
+    peer: br-ctlplane-patch
+  -
+    type: ovs_patch_port
+    name: br-ctlplane-patch
+    bridge_name: br_pub
+    peer: br_pub-patch