1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
Last-Update: 2019-11-07
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@debian.org>
Description: set default cni_path [1] as provided by "containernetworking-plugins".
[1]: https://www.nomadproject.io/docs/configuration/client.html#cni_path
--- a/client/allocrunner/networking_bridge_linux.go
+++ b/client/allocrunner/networking_bridge_linux.go
@@ -21,9 +21,9 @@
envCNIPath = "CNI_PATH"
// defaultCNIPath is the CNI path to use when it is not set by the client
// and is not set by environment variable
- defaultCNIPath = "/opt/cni/bin"
+ defaultCNIPath = "/usr/lib/cni"
// defaultNomadBridgeName is the name of the bridge to use when not set by
// the client
defaultNomadBridgeName = "nomad"
|
