@@ -165,6 +165,7 @@ func (h *HostHelper) CopyMasterConfigToHost(sourceFile, destDir string) error {

 	if err != nil {

 		return err

 	}

+	defer os.RemoveAll(localDir)

 	tarHelper := tarhelper.New()

 	tarHelper.SetExclusionPattern(nil)

 	var tarLog io.Writer

@@ -176,6 +177,7 @@ func (h *HostHelper) CopyMasterConfigToHost(sourceFile, destDir string) error {

 		return err

 	}

 	localTarClosed := false

+	defer os.Remove(localTarFile.Name())

 	defer func() {

 		if !localTarClosed {

 			errors.LogError(localTarFile.Close())

@@ -441,7 +441,41 @@ func (h *Helper) copyConfig(hostDir string) (string, error) {

 		}

 		return "", err

 	}

-	return filepath.Join(tempDir, filepath.Base(hostDir)), nil

+

+	// The configuration dir comes in as something like /tmp/openshift-config%d/openshift.local.config/... .

+	// Remove the intermediate openshift.local.config directory and reparent its files.

+	// Thus the return value of this function represents both the configuration

+	// directory as well as the temporary directory which should be removed at exit.

+

+	subDirPath := filepath.Join(tempDir, filepath.Base(hostDir))

+	subDir, err := os.Open(subDirPath)

+	if err != nil {

+		glog.V(2).Infof("Error opening temporary config dir %s: %v", subDir, err)

+		return "", err

+	}

+

+	names, err := subDir.Readdirnames(0)

+	if err != nil {

+		glog.V(2).Infof("Error listing temporary config dir %s: %v", subDir, err)

+		return "", err

+	}

+

+	for _, name := range names {

+		err = os.Rename(filepath.Join(subDirPath, name), filepath.Join(tempDir, name))

+		if err != nil {

+			glog.V(2).Infof("Error moving file/dir %s: %v", filepath.Join(subDirPath, name), err)

+			return "", err

+		}

+	}

+

+	subDir.Close()

+

+	err = os.Remove(subDirPath)

+	if err != nil {

+		glog.V(2).Infof("Error removing temporary config dir %s: %v", subDirPath, err)

+	}

+

+	return tempDir, nil

 }

 func (h *Helper) updateConfig(configDir, hostDir, routerIP, metricsHost string) error {

@@ -290,6 +290,9 @@ func (c *ClientStartConfig) Complete(f *osclientcmd.Factory, cmd *cobra.Command)

 	// Create an initial project

 	c.addTask(fmt.Sprintf("Creating initial project %q", initialProjectName), c.CreateProject)

+	// Remove temporary directory

+	c.addTask("Removing temporary directory", c.RemoveTemporaryDirectory)

+

 	// Display server information

 	c.addTask("Server Information", c.ServerInfo)

@@ -691,7 +694,11 @@ func (c *ClientStartConfig) Login(out io.Writer) error {

 // CreateProject creates a new project for the current user

 func (c *ClientStartConfig) CreateProject(out io.Writer) error {

 	return openshift.CreateProject(initialProjectName, initialProjectDisplay, initialProjectDesc, "oc", out)

+}

+// RemoveTemporaryDirectory removes the local configuration directory

+func (c *ClientStartConfig) RemoveTemporaryDirectory(out io.Writer) error {

+	return os.RemoveAll(c.LocalConfigDir)

 }

 // ServerInfo displays server information after a successful start