rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-25 12:47:20 +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

11
cmd/cloudinit/cloudinit.go
View File

@@ -96,11 +96,7 @@ func saveFiles(cloudConfigBytes, scriptBytes []byte, metadata datasource.Metadat
}
func currentDatasource() (datasource.Datasource, error) {
cfg, err := rancherConfig.LoadConfig()
if err != nil {
log.WithFields(log.Fields{"err": err}).Error("Failed to read rancher config")
return nil, err
}
cfg := rancherConfig.LoadConfig()
dss := getDatasources(cfg)
if len(dss) == 0 {
@@ -169,10 +165,7 @@ func fetchUserData() ([]byte, datasource.Metadata, error) {
}
func executeCloudConfig() error {
cc, err := rancherConfig.LoadConfig()
if err != nil {
return err
}
cc := rancherConfig.LoadConfig()
if len(cc.SSHAuthorizedKeys) > 0 {
authorizeSSHKeys("rancher", cc.SSHAuthorizedKeys, sshKeyName)

5
cmd/control/env.go
View File

@@ -12,10 +12,7 @@ import (
)
func envAction(c *cli.Context) error {
cfg, err := config.LoadConfig()
if err != nil {
log.Fatal(err)
}
cfg := config.LoadConfig()
args := c.Args()
if len(args) == 0 {

5
cmd/control/install.go
View File

@@ -58,10 +58,7 @@ func installAction(c *cli.Context) error {
}
image := c.String("image")
cfg, err := config.LoadConfig()
if err != nil {
log.WithFields(log.Fields{"err": err}).Fatal("ros install: failed to load config")
}
cfg := config.LoadConfig()
if image == "" {
image = cfg.Rancher.Upgrade.Image + ":" + config.VERSION + config.SUFFIX
}

6
cmd/control/os.go
View File

@@ -289,10 +289,6 @@ func parseBody(body []byte) (*Images, error) {
}
func getUpgradeUrl() (string, error) {
cfg, err := config.LoadConfig()
if err != nil {
return "", err
}
cfg := config.LoadConfig()
return cfg.Rancher.Upgrade.Url, nil
}

32
cmd/control/service.go
View File

@@ -18,11 +18,7 @@ type projectFactory struct {
}
func (p *projectFactory) Create(c *cli.Context) (project.APIProject, error) {
cfg, err := config.LoadConfig()
if err != nil {
return nil, err
}
cfg := config.LoadConfig()
return compose.GetProject(cfg, true)
}
@@ -92,10 +88,7 @@ func updateIncludedServices(cfg *config.CloudConfig) error {
func disable(c *cli.Context) error {
changed := false
cfg, err := config.LoadConfig()
if err != nil {
logrus.Fatal(err)
}
cfg := config.LoadConfig()
for _, service := range c.Args() {
if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
@@ -107,7 +100,7 @@ func disable(c *cli.Context) error {
}
if changed {
if err = updateIncludedServices(cfg); err != nil {
if err := updateIncludedServices(cfg); err != nil {
logrus.Fatal(err)
}
}
@@ -117,10 +110,7 @@ func disable(c *cli.Context) error {
func del(c *cli.Context) error {
changed := false
cfg, err := config.LoadConfig()
if err != nil {
logrus.Fatal(err)
}
cfg := config.LoadConfig()
for _, service := range c.Args() {
if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
@@ -131,7 +121,7 @@ func del(c *cli.Context) error {
}
if changed {
if err = updateIncludedServices(cfg); err != nil {
if err := updateIncludedServices(cfg); err != nil {
logrus.Fatal(err)
}
}
@@ -140,10 +130,7 @@ func del(c *cli.Context) error {
}
func enable(c *cli.Context) error {
cfg, err := config.LoadConfig()
if err != nil {
logrus.Fatal(err)
}
cfg := config.LoadConfig()
var enabledServices []string
@@ -163,7 +150,7 @@ func enable(c *cli.Context) error {
logrus.Fatal(err)
}
if err = updateIncludedServices(cfg); err != nil {
if err := updateIncludedServices(cfg); err != nil {
logrus.Fatal(err)
}
}
@@ -172,10 +159,7 @@ func enable(c *cli.Context) error {
}
func list(c *cli.Context) error {
cfg, err := config.LoadConfig()
if err != nil {
logrus.Fatal(err)
}
cfg := config.LoadConfig()
clone := make(map[string]bool)
for service, enabled := range cfg.Rancher.ServicesInclude {

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
}

5
cmd/network/network.go
View File

@@ -47,10 +47,7 @@ func Main() {
}
}
cfg, err := config.LoadConfig()
if err != nil {
log.Fatal(err)
}
cfg := config.LoadConfig()
nameservers := cfg.Rancher.Network.Dns.Nameservers
search := cfg.Rancher.Network.Dns.Search

5
cmd/userdocker/main.go
View File

@@ -28,10 +28,7 @@ const (
)
func Main() {
cfg, err := config.LoadConfig()
if err != nil {
log.Fatal(err)
}
cfg := config.LoadConfig()
if err := startDocker(cfg); err != nil {
log.Fatal(err)