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

make cloud-config the configuration mechanism for RancherOS

Browse Source
This commit is contained in:
Ivan Mikushin
2015-07-29 11:52:15 +05:00
parent 5d93d51fc5
commit 7ad60c07bd
24 changed files with 919 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
config/disk.go
View File

@@ -18,38 +18,15 @@ func writeToFile(data interface{}, filename string) error {
}
func saveToDisk(data map[interface{}]interface{}) error {
config := make(map[interface{}]interface{})
private := make(map[interface{}]interface{})
private, config := filterDottedKeys(data, []string{
"rancher.ssh",
"rancher.user_docker.ca_key",
"rancher.user_docker.ca_cert",
"rancher.user_docker.server_key",
"rancher.user_docker.server_cert",
})
for k, v := range data {
if k == "ssh" {
private[k] = v
} else if k == "user_docker" {
var userDockerConfig DockerConfig
var userDockerConfigPrivate DockerConfig
err := util.Convert(v, &userDockerConfig)
if err != nil {
return err
}
userDockerConfigPrivate.CAKey = userDockerConfig.CAKey
userDockerConfigPrivate.CACert = userDockerConfig.CACert
userDockerConfigPrivate.ServerKey = userDockerConfig.ServerKey
userDockerConfigPrivate.ServerCert = userDockerConfig.ServerCert
userDockerConfig.CAKey = ""
userDockerConfig.CACert = ""
userDockerConfig.ServerKey = ""
userDockerConfig.ServerCert = ""
config[k] = userDockerConfig
private[k] = userDockerConfigPrivate
} else {
config[k] = v
}
}
err := writeToFile(config, ConfigFile)
err := writeToFile(config, LocalConfigFile)
if err != nil {
return err
}
@@ -57,10 +34,6 @@ func saveToDisk(data map[interface{}]interface{}) error {
return writeToFile(private, PrivateConfigFile)
}
func readSavedConfig(bytes []byte) (map[interface{}]interface{}, error) {
return readConfig(bytes, CloudConfigFile, ConfigFile, PrivateConfigFile)
}
func readConfig(bytes []byte, files ...string) (map[interface{}]interface{}, error) {
// You can't just overlay yaml bytes on to maps, it won't merge, but instead
// just override the keys and not merge the map values.
@@ -77,7 +50,7 @@ func readConfig(bytes []byte, files ...string) (map[interface{}]interface{}, err
return nil, err
}
util.MergeMaps(left, right)
left = util.MapsUnion(left, right, util.Replace)
}
if bytes != nil && len(bytes) > 0 {
@@ -86,7 +59,7 @@ func readConfig(bytes []byte, files ...string) (map[interface{}]interface{}, err
return nil, err
}
util.MergeMaps(left, right)
left = util.MapsUnion(left, right, util.Replace)
}
return left, nil