Merge pull request #11898 from jim-minter/issue11889

Merged by openshift-bot

Author: OpenShift Bot

pkg/bootstrap/docker/dockerhelper/filetransfer.go

@@ -73,18 +73,19 @@ func newContainerDownloader(client *docker.Client, container, path string) io.Re
 	return r
 }
 
-func newContainerUploader(client *docker.Client, container, path string) io.WriteCloser {
+func newContainerUploader(client *docker.Client, container, path string) (io.WriteCloser, <-chan error) {
 	r, w := io.Pipe()
+	errch := make(chan error, 1)
 
 	go func() {
 		opts := docker.UploadToContainerOptions{
 			Path:        path,
 			InputStream: r,
 		}
-		r.CloseWithError(client.UploadToContainer(container, opts))
+		errch <- client.UploadToContainer(container, opts)
 	}()
 
-	return w
+	return w, errch
 }
 
 type readCloser struct {
@@ -121,16 +122,16 @@ func DownloadDirFromContainer(client *docker.Client, container, src, dst string)
 
 // UploadFileToContainer uploads a file to a remote container.
 func UploadFileToContainer(client *docker.Client, container, src, dest string) error {
-	uploader := newContainerUploader(client, container, filepath.Dir(dest))
+	uploader, errch := newContainerUploader(client, container, filepath.Dir(dest))
 
 	nullWalkFunc := func(path string, info os.FileInfo, err error) error { return err }
 
 	t := stitar.New()
 	err := t.StreamFileAsTarWithCallback(src, filepath.Base(dest), uploader, nullWalkFunc, false)
+	uploader.Close()
 	if err != nil {
-		uploader.Close()
 		return err
 	}
 
-	return uploader.Close()
+	return <-errch
 }

pkg/bootstrap/docker/openshift/helper.go

@@ -256,7 +256,6 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
 	// Create configuration if needed
 	var nodeHost string
 	if !skipCreateConfig {
-		glog.V(1).Infof("Creating openshift configuration at %s on Docker host", opt.HostConfigDir)
 		fmt.Fprintf(out, "Creating initial OpenShift configuration\n")
 		createConfigCmd := []string{
 			"start",
@@ -296,7 +295,7 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
 		if err != nil {
 			return "", errors.NewError("could not copy OpenShift configuration").WithCause(err)
 		}
-		err = h.updateConfig(configDir, opt.HostConfigDir, opt.RouterIP, opt.MetricsHost, opt.LoggingHost)
+		err = h.updateConfig(configDir, opt.RouterIP, opt.MetricsHost, opt.LoggingHost)
 		if err != nil {
 			cleanupConfig()
 			return "", errors.NewError("could not update OpenShift configuration").WithCause(err)
@@ -440,7 +439,7 @@ func (h *Helper) copyConfig() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	glog.V(1).Infof("Copying host config to local directory %s", tempDir)
+	glog.V(1).Infof("Copying OpenShift config to local directory %s", tempDir)
 	if err = h.hostHelper.DownloadDirFromContainer(serverConfigPath, tempDir); err != nil {
 		if removeErr := os.RemoveAll(tempDir); removeErr != nil {
 			glog.V(2).Infof("Error removing temporary config dir %s: %v", tempDir, removeErr)
@@ -481,7 +480,7 @@ func GetConfigFromContainer(client *docker.Client) (*configapi.MasterConfig, err
 	return config, nil
 }
 
-func (h *Helper) updateConfig(configDir, hostDir, routerIP, metricsHost, loggingHost string) error {
+func (h *Helper) updateConfig(configDir, routerIP, metricsHost, loggingHost string) error {
 	cfg, configPath, err := h.GetConfigFromLocalDir(configDir)
 	if err != nil {
 		return err