From 55c4d76e609e950686408ce73db3f1b3cb2d84e9 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Fri, 28 Aug 2015 21:13:21 -0700
Subject: [PATCH] Make sure services_include overrides services

---
 compose/project.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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