Merge pull request #2850 from ncdc/fix-node-rootdir

OpenShift Bot · OpenShift Bot · commit 546fda9a6859 · 2015-06-05T11:44:49.000-04:00
Merged by openshift-bot
diff --git a/pkg/cmd/server/kubernetes/node.go b/pkg/cmd/server/kubernetes/node.go
@@ -134,6 +134,8 @@ func (c *NodeConfig) RunKubelet() {
 		}
 	}
 	c.KubeletConfig.DockerClient = c.DockerClient
+	// updated by NodeConfig.EnsureVolumeDir
+	c.KubeletConfig.RootDirectory = c.VolumeDir
 	glog.Fatal(c.KubeletServer.Run(c.KubeletConfig))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ func (c *NodeConfig) RunKubelet() {`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`c.KubeletConfig.DockerClient = c.DockerClient`
	`137`	`+ // updated by NodeConfig.EnsureVolumeDir`
	`138`	`+ c.KubeletConfig.RootDirectory = c.VolumeDir`
`137`	`139`	`glog.Fatal(c.KubeletServer.Run(c.KubeletConfig))`
`138`	`140`	`}`
`139`	`141`