Merge pull request containers#3755 from mheon/fix_cniname

Adjust name of Podman CNI network bridge
mheon · Aug 26, 2019 · 6240bd4 · 6240bd4
2 parents c0528c1 + 7b4102c
commit 6240bd4
Showing 1 changed file with 32 additions and 23 deletions.
diff --git a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist
@@ -2,28 +2,37 @@
     "cniVersion": "0.4.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
-        }
-      },
-      {
-        "type": "firewall",
-	"backend": "iptables"
-      }
+	{
+            "type": "bridge",
+            "bridge": "cni-podman0",
+            "isGateway": true,
+            "ipMasq": true,
+            "ipam": {
+		"type": "host-local",
+		"routes": [
+		    {
+			"dst": "0.0.0.0/0"
+		    }
+		],
+		"ranges": [
+		    [
+			{
+			    "subnet": "10.88.0.0/16",
+			    "gateway": "10.88.0.1"
+			}
+		    ]
+		]
+            }
+	},
+	{
+            "type": "portmap",
+            "capabilities": {
+		"portMappings": true
+            }
+	},
+	{
+            "type": "firewall",
+	    "backend": "iptables"
+	}
     ]
 }