rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 23:04:41 +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

12
compose/project.go
View File

@@ -22,11 +22,7 @@ import (
func CreateService(cfg *config.CloudConfig, name string, serviceConfig *composeConfig.ServiceConfigV1) (project.Service, error) {
if cfg == nil {
var err error
cfg, err = config.LoadConfig()
if err != nil {
return nil, err
}
cfg = config.LoadConfig()
}
p, err := CreateServiceSet("once", cfg, map[string]*composeConfig.ServiceConfigV1{
@@ -195,11 +191,7 @@ func newCoreServiceProject(cfg *config.CloudConfig, useNetwork bool) (*project.P
p.AddListener(projectEvents)
p.ReloadCallback = func() error {
var err error
cfg, err = config.LoadConfig()
if err != nil {
return err
}
cfg = config.LoadConfig()
environmentLookup.SetConfig(cfg)