summaryrefslogtreecommitdiff
path: root/libpod.conf
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-09-11 10:52:38 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-09-12 19:18:24 +0000
commit6e263fed350b2471c03329edae65e38286043840 (patch)
treeaf1dfadfb905f2d8795ac3faf0a66b3b7c939863 /libpod.conf
parentd9580ec62b716d7c8e861dd27c4b452f2419eb65 (diff)
downloadpodman-6e263fed350b2471c03329edae65e38286043840.tar.gz
podman-6e263fed350b2471c03329edae65e38286043840.tar.bz2
podman-6e263fed350b2471c03329edae65e38286043840.zip
Explicitly set default CNI network name in libpod.conf
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1438 Approved by: TomSweeneyRedHat
Diffstat (limited to 'libpod.conf')
-rw-r--r--libpod.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/libpod.conf b/libpod.conf
index 9de42caf2..cc4a10cff 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -58,6 +58,15 @@ cni_plugin_dir = [
"/opt/cni/bin"
]
+# Default CNI network for libpod.
+# If multiple CNI network configs are present, libpod will use the network with
+# the name given here for containers unless explicitly overridden.
+# The default here is set to the name we set in the
+# 87-podman-bridge.conflist included in the repository.
+# Not setting this, or setting it to the empty string, will use normal CNI
+# precedence rules for selecting between multiple networks.
+cni_default_network = "podman"
+
# Default libpod namespace
# If libpod is joined to a namespace, it will see only containers and pods
# that were created in the same namespace, and will create new containers and