rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-05 00:37:12 +00:00
Code Issues Releases Wiki Activity

do not save/use bad cloud-config

Browse Source
This commit is contained in:
Ivan Mikushin
2015-08-20 19:20:51 +05:00
parent aa1af05d46
commit 642c557c73
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/cloudinit/cloudinit.go
View File

@@ -208,15 +208,22 @@ func saveCloudConfig() error {
return err
}
} else if config.IsCloudConfig(userData) {
// nothing to do
if rancherConfig.ReadConfig(userDataBytes) == nil {
log.WithFields(log.Fields{"cloud-config": userData}).Warn("Failed to parse cloud-config, not saving.")
userDataBytes = []byte{}
}
} else {
log.Errorf("Unrecognized cloud-init\n%s", userData)
userDataBytes = []byte{}
}
if userDataBytes, scriptBytes, err = mergeBaseConfig(userDataBytes, scriptBytes); err != nil {
userDataBytesMerged, scriptBytes, err := mergeBaseConfig(userDataBytes, scriptBytes)
if err != nil {
log.Errorf("Failed to merge base config: %v", err)
return err
} else if rancherConfig.ReadConfig(userDataBytesMerged) == nil {
log.WithFields(log.Fields{"cloud-config": userData}).Warn("Failed to parse merged cloud-config, not merging.")
} else {
userDataBytes = userDataBytesMerged
}
return saveFiles(userDataBytes, scriptBytes, metadata)
@@ -306,14 +313,14 @@ func Main() {
if save {
err := saveCloudConfig()
if err != nil {
log.Fatalf("Failed to save cloud config: %v", err)
log.WithFields(log.Fields{"err": err}).Error("Failed to save cloud-config")
}
}
if execute {
err := executeCloudConfig()
if err != nil {
log.Fatalf("Failed to save cloud config: %v", err)
log.WithFields(log.Fields{"err": err}).Error("Failed to execute cloud-config")
}
}
}