diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2017-12-07 15:37:51 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-14 23:59:21 +0000 |
| commit | 72e8efccc918e87e5e202bfbbcbdcf31707963c3 (patch) | |
| tree | d6c3796249deab58090c253fb720267ad1549371 /cmd | |
| parent | fcf52249b8f75b0f12d0e9c725efa3294739c772 (diff) | |
| download | podman-72e8efccc918e87e5e202bfbbcbdcf31707963c3.tar.gz podman-72e8efccc918e87e5e202bfbbcbdcf31707963c3.tar.bz2 podman-72e8efccc918e87e5e202bfbbcbdcf31707963c3.zip | |
Fix Travis tests
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #109
Approved by: mheon
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/kpod/common.go | 5 | ||||
| -rw-r--r-- | cmd/kpod/main.go | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go index 339f56fdd..774215479 100644 --- a/cmd/kpod/common.go +++ b/cmd/kpod/common.go @@ -50,7 +50,7 @@ func getRuntime(c *cli.Context) (*libpod.Runtime, error) { options.GraphDriverName = config.Storage options.GraphDriverOptions = config.StorageOptions - return libpod.NewRuntime(libpod.WithStorageConfig(options), libpod.WithConmonPath(config.Conmon), libpod.WithOCIRuntime(config.Runtime)) + return libpod.NewRuntime(libpod.WithStorageConfig(options), libpod.WithConmonPath(config.Conmon), libpod.WithOCIRuntime(config.Runtime), libpod.WithCNIDirs(config.NetworkDir, config.PluginDir)) } func shutdownStores() { @@ -98,6 +98,9 @@ func getConfig(c *cli.Context) (*libkpod.Config, error) { if c.GlobalIsSet("runtime") { config.Runtime = c.GlobalString("runtime") } + if c.GlobalIsSet("cni-config-dir") { + config.NetworkDir = c.GlobalString("cni-config-dir") + } return config, nil } diff --git a/cmd/kpod/main.go b/cmd/kpod/main.go index 90a4d1d7f..a2a81c8b6 100644 --- a/cmd/kpod/main.go +++ b/cmd/kpod/main.go @@ -109,6 +109,10 @@ func main() { } app.Flags = []cli.Flag{ cli.StringFlag{ + Name: "cni-config-dir", + Usage: "path of the configuration directory for CNI networks", + }, + cli.StringFlag{ Name: "config, c", Usage: "path of a config file detailing container server configuration options", }, |