rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 07:44:21 +00:00
Code Issues Releases Wiki Activity

Fix loading network files from ros service compose commands

Browse Source
This commit is contained in:
Darren Shepherd
2015-10-02 00:57:13 -07:00
parent 13d0241b7e
commit 2966ef8e5d
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/service.go
View File

@@ -23,7 +23,7 @@ func (p *projectFactory) Create(c *cli.Context) (*project.Project, error) {
return nil, err
}
return compose.GetProject(cfg)
return compose.GetProject(cfg, true)
}
func beforeApp(c *cli.Context) error {

2
cmd/userdocker/main.go
View File

@@ -53,7 +53,7 @@ func enter(cfg *config.CloudConfig) error {
log.Infof("Starting Docker in context: %s", context)
p, err := compose.GetProject(cfg)
p, err := compose.GetProject(cfg, true)
if err != nil {
return err
}

16
compose/project.go
View File

@@ -40,17 +40,8 @@ func RunServiceSet(name string, cfg *config.CloudConfig, configs map[string]*pro
return p, p.Up()
}
func RunServices(cfg *config.CloudConfig) error {
p, err := newCoreServiceProject(cfg)
if err != nil {
return err
}
return p.Up()
}
func GetProject(cfg *config.CloudConfig) (*project.Project, error) {
return newCoreServiceProject(cfg)
func GetProject(cfg *config.CloudConfig, networkingAvailable bool) (*project.Project, error) {
return newCoreServiceProject(cfg, networkingAvailable)
}
func newProject(name string, cfg *config.CloudConfig) (*project.Project, error) {
@@ -102,8 +93,7 @@ func addServices(p *project.Project, enabled map[interface{}]interface{}, config
return enabled
}
func newCoreServiceProject(cfg *config.CloudConfig) (*project.Project, error) {
network := false
func newCoreServiceProject(cfg *config.CloudConfig, network bool) (*project.Project, error) {
projectEvents := make(chan project.ProjectEvent)
enabled := map[interface{}]interface{}{}

6
init/sysinit.go
View File

@@ -98,7 +98,11 @@ func SysInit() error {
_, err = config.ChainCfgFuncs(cfg,
loadImages,
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
return cfg, compose.RunServices(cfg)
p, err := compose.GetProject(cfg, false)
if err != nil {
return cfg, err
}
return cfg, p.Up()
},
func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
syscall.Sync()