From 6e263fed350b2471c03329edae65e38286043840 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 11 Sep 2018 10:52:38 -0400 Subject: Explicitly set default CNI network name in libpod.conf Signed-off-by: Matthew Heon Closes: #1438 Approved by: TomSweeneyRedHat --- libpod/runtime.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpod') diff --git a/libpod/runtime.go b/libpod/runtime.go index 8dc561cd8..63b8c971e 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -139,11 +139,11 @@ type RuntimeConfig struct { // CNIPluginDir sets a number of directories where the CNI network // plugins can be located CNIPluginDir []string `toml:"cni_plugin_dir"` - // HooksDir Path to the directory containing hooks configuration files - HooksDir string `toml:"hooks_dir"` // CNIDefaultNetwork is the network name of the default CNI network // to attach pods to CNIDefaultNetwork string `toml:"cni_default_network,omitempty"` + // HooksDir Path to the directory containing hooks configuration files + HooksDir string `toml:"hooks_dir"` // HooksDirNotExistFatal switches between fatal errors and non-fatal // warnings if the configured HooksDir does not exist. HooksDirNotExistFatal bool `toml:"hooks_dir_not_exist_fatal"` -- cgit v1.2.3-54-g00ecf