Merge pull request #331 from redhat-nfvpe/fix/dhcp-daemon-mount

Bug 1754686: The DHCP daemon should mount the directory for the socketfile (backport 4.2)
openshift · Oct 22, 2019 · bfd66b7 · bfd66b7
2 parents 9bf1cbf + 4c4705b
commit bfd66b7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/bindata/network/multus/003-dhcp-daemon.yaml b/bindata/network/multus/003-dhcp-daemon.yaml
@@ -31,10 +31,10 @@ spec:
       - name: dhcp-daemon-initialization
         image: {{.CNIPluginsImage}}
         command: ["/bin/sh"]
-        args: ["-c", "rm -f /var/run/cni/dhcp.sock"]
+        args: ["-c", "rm -f /host/run/cni/dhcp.sock"]
         volumeMounts:
         - name: socketpath
-          mountPath: /var/run/cni
+          mountPath: /host/run/cni
       containers:
       - name: dhcp-daemon
         # Based on: https://github.com/s1061123/cni-dhcp-daemon/blob/master/Dockerfile
@@ -49,13 +49,13 @@ spec:
           privileged: true
         volumeMounts:
         - name: socketpath
-          mountPath: /var/run/cni
+          mountPath: /host/run/cni
         - name: procpath
           mountPath: /host/proc
       volumes:
         - name: socketpath
           hostPath:
-            path: /var/run/cni
+            path: /run/cni
         - name: procpath
           hostPath:
             path: /proc