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

Support registry credentials in cloud config

Browse Source
This commit is contained in:
Josh Curl
2016-05-27 16:09:03 -07:00
parent 4ab3162ed8
commit adb5635186
4 changed files with 100 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/disk.go
View File

@@ -11,6 +11,7 @@ import (
yaml "github.com/cloudfoundry-incubator/candiedyaml"
"github.com/coreos/coreos-cloudinit/datasource"
"github.com/coreos/coreos-cloudinit/initialize"
"github.com/docker/engine-api/types"
composeConfig "github.com/docker/libcompose/config"
"github.com/rancher/os/util"
)
@@ -194,6 +195,9 @@ func amendNils(c *CloudConfig) *CloudConfig {
if t.Rancher.ServicesInclude == nil {
t.Rancher.ServicesInclude = map[string]bool{}
}
if t.Rancher.RegistryAuths == nil {
t.Rancher.RegistryAuths = map[string]types.AuthConfig{}
}
return &t
}