From 946b4ced544e5988a971da12c7e34a684ab0e39d Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Thu, 4 Jan 2018 12:59:33 -0600
Subject: Enable port bindings

Set up nbetworking ports for the following use cases:

* bind the same port between host and container
* bind a specific host port to a different container port
* bind a random host port to a specific container port

Signed-off-by: baude <bbaude@redhat.com>

Closes: #214
Approved by: baude
---
 cni/87-podman-bridge.conflist | 25 +++++++++++++++++++++++++
 cni/97-podman-bridge.conf     | 15 ---------------
 2 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 cni/87-podman-bridge.conflist
 delete mode 100644 cni/97-podman-bridge.conf

(limited to 'cni')

diff --git a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist
new file mode 100644
index 000000000..a5e241c80
--- /dev/null
+++ b/cni/87-podman-bridge.conflist
@@ -0,0 +1,25 @@
+{
+    "cniVersion": "0.3.0",
+    "name": "podman",
+    "plugins": [
+      {
+        "type": "bridge",
+        "bridge": "cni0",
+        "isGateway": true,
+        "ipMasq": true,
+        "ipam": {
+            "type": "host-local",
+            "subnet": "10.88.0.0/16",
+            "routes": [
+                { "dst": "0.0.0.0/0" }
+            ]
+        }
+      },
+      {
+        "type": "portmap",
+        "capabilities": {
+          "portMappings": true
+        }
+      }
+    ]
+}
diff --git a/cni/97-podman-bridge.conf b/cni/97-podman-bridge.conf
deleted file mode 100644
index 27fc096c4..000000000
--- a/cni/97-podman-bridge.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "cniVersion": "0.3.0",
-    "name": "podman",
-    "type": "bridge",
-    "bridge": "cni0",
-    "isGateway": true,
-    "ipMasq": true,
-    "ipam": {
-        "type": "host-local",
-        "subnet": "10.88.0.0/16",
-        "routes": [
-            { "dst": "0.0.0.0/0" }
-        ]
-    }
-}
-- 
cgit v1.2.3-54-g00ecf