rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-29 16:26:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1692 from SvenDowideit/fix-ssh-keys-from-user-data

Browse Source 
Use a fake cloud-config struct that only contains the NetworkConfig -…
This commit is contained in:
Sven Dowideit 2017-03-14 16:19:43 +10:00 committed by GitHub
commit c62c05773c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/cloudinitsave/cloudinitsave.go
View File

@ -143,9 +143,16 @@ func saveFiles(cloudConfigBytes, scriptBytes []byte, metadata datasource.Metadat
log.Infof("not writing %s: its all defaults.", rancherConfig.CloudConfigNetworkFile) log.Infof("not writing %s: its all defaults.", rancherConfig.CloudConfigNetworkFile)
return nil return nil
} }
type nonRancherCfg struct {
Network netconf.NetworkConfig `yaml:"network,omitempty"`
}
type nonCfg struct {
Rancher nonRancherCfg `yaml:"rancher,omitempty"`
}
// write the network.yml file from metadata // write the network.yml file from metadata
cc := rancherConfig.CloudConfig{ cc := nonCfg{
Rancher: rancherConfig.RancherConfig{ Rancher: nonRancherCfg{
Network: metadata.NetworkConfig, Network: metadata.NetworkConfig,
}, },
} }