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

Rewrite a few scripts in Go and remove unneeded services

Browse Source
This commit is contained in:
Josh Curl
2016-10-17 14:47:44 -07:00
parent 9755a37fe6
commit a7d405991c
22 changed files with 321 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/disk.go
View File

@@ -176,9 +176,6 @@ func amendNils(c *CloudConfig) *CloudConfig {
if t.Rancher.Environment == nil {
t.Rancher.Environment = map[string]string{}
}
if t.Rancher.Autoformat == nil {
t.Rancher.Autoformat = map[string]*composeConfig.ServiceConfigV1{}
}
if t.Rancher.BootstrapContainers == nil {
t.Rancher.BootstrapContainers = map[string]*composeConfig.ServiceConfigV1{}
}
@@ -199,7 +196,6 @@ func amendNils(c *CloudConfig) *CloudConfig {
func amendContainerNames(c *CloudConfig) *CloudConfig {
for _, scm := range []map[string]*composeConfig.ServiceConfigV1{
c.Rancher.Autoformat,
c.Rancher.BootstrapContainers,
c.Rancher.Services,
} {