config: remove network config from CloudConfig

This commit is contained in:
Alex Crawford
2015-01-26 17:35:08 -08:00
parent 9605b5edf2
commit 536f8acf2a
5 changed files with 35 additions and 42 deletions

View File

@@ -27,13 +27,12 @@ import (
// directly to YAML. Fields that cannot be set in the cloud-config (fields
// used for internal use) have the YAML tag '-' so that they aren't marshalled.
type CloudConfig struct {
SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"`
CoreOS CoreOS `yaml:"coreos"`
WriteFiles []File `yaml:"write_files"`
Hostname string `yaml:"hostname"`
Users []User `yaml:"users"`
ManageEtcHosts EtcHosts `yaml:"manage_etc_hosts"`
Internal Internals `yaml:"-"`
SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"`
CoreOS CoreOS `yaml:"coreos"`
WriteFiles []File `yaml:"write_files"`
Hostname string `yaml:"hostname"`
Users []User `yaml:"users"`
ManageEtcHosts EtcHosts `yaml:"manage_etc_hosts"`
}
type CoreOS struct {
@@ -46,10 +45,6 @@ type CoreOS struct {
Units []Unit `yaml:"units"`
}
type Internals struct {
NetworkConfig []byte
}
func IsCloudConfig(userdata string) bool {
header := strings.SplitN(userdata, "\n", 2)[0]