diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-09-11 10:52:38 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-12 19:18:24 +0000 |
| commit | 6e263fed350b2471c03329edae65e38286043840 (patch) | |
| tree | af1dfadfb905f2d8795ac3faf0a66b3b7c939863 /libpod/runtime.go | |
| parent | d9580ec62b716d7c8e861dd27c4b452f2419eb65 (diff) | |
| download | podman-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/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 4 |
1 files changed, 2 insertions, 2 deletions
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"` |