rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 23:34:57 +00:00
Code Issues Releases Wiki Activity

Fix boot issues due to invalid configs

Browse Source
This commit is contained in:
Josh Curl
2016-06-01 18:41:55 -07:00
parent 97344cc535
commit 08f40ad3e7
14 changed files with 124 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/control/tlsconf.go
View File

@@ -74,10 +74,7 @@ func writeCerts(generateServer bool, hostname []string, cfg *config.CloudConfig,
}
}
cfg, err := config.LoadConfig()
if err != nil {
return err
}
cfg = config.LoadConfig()
if err := ioutil.WriteFile(certPath, []byte(cfg.Rancher.Docker.ServerCert), 0400); err != nil {
return err
@@ -112,10 +109,7 @@ func writeCaCerts(cfg *config.CloudConfig, caCertPath, caKeyPath string) error {
}
}
cfg, err := config.LoadConfig()
if err != nil {
return err
}
cfg = config.LoadConfig()
if err := ioutil.WriteFile(caCertPath, []byte(cfg.Rancher.Docker.CACert), 0400); err != nil {
return err
@@ -170,11 +164,9 @@ func Generate(generateServer bool, outDir string, hostnames []string) error {
}
}
cfg, err := config.LoadConfig()
if err != nil {
return err
}
err = writeCaCerts(cfg, caCertPath, caKeyPath)
cfg := config.LoadConfig()
err := writeCaCerts(cfg, caCertPath, caKeyPath)
if err != nil {
return err
}