Create directory using os.MkDirAll, as mkdir -p does not work on windows
parent
6d4ee3ad0b
commit
8631246e76
|
@ -186,9 +186,9 @@ func commandRunner(h *host.Host) (command.Runner, error) {
|
||||||
return &command.FakeCommandRunner{}, nil
|
return &command.FakeCommandRunner{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if driver.BareMetal(h.Driver.DriverName()) {
|
if driver.BareMetal(h.Driver.DriverName()) {
|
||||||
glog.Infof("returning ExecRunner for %q driver", d)
|
glog.Infof("returning ExecRunner for %q driver", d)
|
||||||
return command.NewExecRunner(), nil
|
return command.NewExecRunner(), nil
|
||||||
}
|
}
|
||||||
if driver.IsKIC(d) {
|
if driver.IsKIC(d) {
|
||||||
glog.Infof("Returning KICRunner for %q driver", d)
|
glog.Infof("Returning KICRunner for %q driver", d)
|
||||||
|
|
|
@ -19,6 +19,7 @@ package provision
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
@ -116,16 +117,19 @@ func configureAuth(p miniProvisioner) error {
|
||||||
|
|
||||||
func copyHostCerts(authOptions auth.Options) error {
|
func copyHostCerts(authOptions auth.Options) error {
|
||||||
log.Infof("copyHostCerts")
|
log.Infof("copyHostCerts")
|
||||||
execRunner := command.NewExecRunner()
|
|
||||||
|
err := os.MkdirAll(authOptions.StorePath, 0700)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("mkdir failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
hostCerts := map[string]string{
|
hostCerts := map[string]string{
|
||||||
authOptions.CaCertPath: path.Join(authOptions.StorePath, "ca.pem"),
|
authOptions.CaCertPath: path.Join(authOptions.StorePath, "ca.pem"),
|
||||||
authOptions.ClientCertPath: path.Join(authOptions.StorePath, "cert.pem"),
|
authOptions.ClientCertPath: path.Join(authOptions.StorePath, "cert.pem"),
|
||||||
authOptions.ClientKeyPath: path.Join(authOptions.StorePath, "key.pem"),
|
authOptions.ClientKeyPath: path.Join(authOptions.StorePath, "key.pem"),
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := execRunner.RunCmd(exec.Command("mkdir", "-p", authOptions.StorePath)); err != nil {
|
execRunner := command.NewExecRunner()
|
||||||
return err
|
|
||||||
}
|
|
||||||
for src, dst := range hostCerts {
|
for src, dst := range hostCerts {
|
||||||
f, err := assets.NewFileAsset(src, path.Dir(dst), filepath.Base(dst), "0777")
|
f, err := assets.NewFileAsset(src, path.Dir(dst), filepath.Base(dst), "0777")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue