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

Disable ip address metadata - it needs work

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-04-11 03:53:37 +00:00
parent a677b753bc
commit 2cbd384229
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/cloudinit/datasource/metadata/gce/metadata.go
View File

@ -21,7 +21,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/rancher/os/netconf" //"github.com/rancher/os/netconf"
"github.com/rancher/os/config/cloudinit/datasource" "github.com/rancher/os/config/cloudinit/datasource"
"github.com/rancher/os/config/cloudinit/datasource/metadata" "github.com/rancher/os/config/cloudinit/datasource/metadata"
@ -74,6 +74,7 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
SSHPublicKeys: nil, SSHPublicKeys: nil,
} }
/* Disabled, using DHCP like in pre-0.9.1 - missing gateway and netmask, and testing time
addresses := []string{} addresses := []string{}
if public != nil { if public != nil {
addresses = append(addresses, public.String()) addresses = append(addresses, public.String())
@ -89,6 +90,7 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
md.NetworkConfig.Interfaces = make(map[string]netconf.InterfaceConfig) md.NetworkConfig.Interfaces = make(map[string]netconf.InterfaceConfig)
md.NetworkConfig.Interfaces["eth0"] = network md.NetworkConfig.Interfaces["eth0"] = network
} }
*/
keyStrings := strings.Split(projectSSHKeys+"\n"+instanceSSHKeys, "\n") keyStrings := strings.Split(projectSSHKeys+"\n"+instanceSSHKeys, "\n")