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

Merge pull request #973 from joshwget/remove-unneeded-code

Browse Source 
Remove unneeded service processing code
This commit is contained in:
Darren Shepherd
2016-06-02 19:28:17 -06:00
parent 71c8f40ffe 55d629b980
commit 4ab3162ed8
5 changed files with 26 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compose/project.go
View File

@@ -217,7 +217,7 @@ func newCoreServiceProject(cfg *config.CloudConfig, useNetwork bool) (*project.P
log.Errorf("Failed to parse YAML configuration: %s : %v", service, err)
continue
}
bytes, err = yaml.Marshal(adjustContainerNames(config.StringifyValues(m)))
bytes, err = yaml.Marshal(adjustContainerNames(m))
if err != nil {
log.Errorf("Failed to marshal YAML configuration: %s : %v", service, err)
continue
@@ -268,7 +268,7 @@ func StageServices(cfg *config.CloudConfig, services ...string) error {
return fmt.Errorf("Failed to parse YAML configuration: %s : %v", service, err)
}
bytes, err = yaml.Marshal(config.StringifyValues(m))
bytes, err = yaml.Marshal(m)
if err != nil {
return fmt.Errorf("Failed to marshal YAML configuration: %s : %v", service, err)
}