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

Make sure services_include overrides services

Browse Source
This commit is contained in:
Darren Shepherd
2015-08-28 21:13:21 -07:00
parent 0f1b7741d7
commit 55c4d76e60
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compose/project.go
View File

@@ -1,6 +1,8 @@
package compose package compose
import ( import (
"fmt"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/libcompose/cli/logger" "github.com/docker/libcompose/cli/logger"
"github.com/docker/libcompose/docker" "github.com/docker/libcompose/docker"
@@ -115,6 +117,8 @@ func newCoreServiceProject(cfg *config.CloudConfig) (*project.Project, error) {
return err return err
} }
addServices(p, cfg, enabled, cfg.Rancher.Services)
for service, serviceEnabled := range cfg.Rancher.ServicesInclude { for service, serviceEnabled := range cfg.Rancher.ServicesInclude {
if enabled[service] != "" || !serviceEnabled { if enabled[service] != "" || !serviceEnabled {
continue continue
@@ -130,6 +134,7 @@ func newCoreServiceProject(cfg *config.CloudConfig) (*project.Project, error) {
continue continue
} }
fmt.Println("Loading config: %s", string(bytes))
err = p.Load(bytes) err = p.Load(bytes)
if err != nil { if err != nil {
log.Errorf("Failed to load %s : %v", service, err) log.Errorf("Failed to load %s : %v", service, err)
@@ -139,8 +144,6 @@ func newCoreServiceProject(cfg *config.CloudConfig) (*project.Project, error) {
enabled[service] = service enabled[service] = service
} }
addServices(p, cfg, enabled, cfg.Rancher.Services)
return nil return nil
} }