Merge pull request #18863 from openshift-cherrypick-robot/cherry-pick-18779-to-release-3.9

openshift-merge-robot · web-flow · commit 1c027c1a8bde · 2018-03-07T21:54:04.000-08:00
Automatic merge from submit-queue. [release-3.9] sdn: fix CNI IPAM data dir This is an automated cherry-pick of #18779 /assign pravisankar
diff --git a/pkg/network/node/metrics.go b/pkg/network/node/metrics.go
@@ -167,7 +167,7 @@ func updateARPMetrics() {
 
 func updatePodIPMetrics() {
 	numAddrs := 0
-	items, err := ioutil.ReadDir(hostLocalDataDir + "/networks/openshift-sdn/")
+	items, err := ioutil.ReadDir(hostLocalDataDir + "/openshift-sdn/")
 	if err != nil && os.IsNotExist(err) {
 		// Don't log an error if the directory doesn't exist (eg, no pods started yet)
 		return
diff --git a/pkg/network/node/node.go b/pkg/network/node/node.go
@@ -48,7 +48,7 @@ import (
 
 const (
 	openshiftCNIFile = "80-openshift-network.conf"
-	hostLocalDataDir = "/var/lib/cni"
+	hostLocalDataDir = "/var/lib/cni/networks"
 )
 
 type osdnPolicy interface {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ import (`
`48`	`48`
`49`	`49`	`const (`
`50`	`50`	`openshiftCNIFile = "80-openshift-network.conf"`
`51`		`- hostLocalDataDir = "/var/lib/cni"`
	`51`	`+ hostLocalDataDir = "/var/lib/cni/networks"`
`52`	`52`	`)`
`53`	`53`
`54`	`54`	`type osdnPolicy interface {`