From 2cbd384229f179b5a05a69c7ac6b4c8169eb6977 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 11 Apr 2017 03:53:37 +0000 Subject: [PATCH] Disable ip address metadata - it needs work Signed-off-by: Sven Dowideit --- config/cloudinit/datasource/metadata/gce/metadata.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/cloudinit/datasource/metadata/gce/metadata.go b/config/cloudinit/datasource/metadata/gce/metadata.go index b03f655b..cb8a9918 100755 --- a/config/cloudinit/datasource/metadata/gce/metadata.go +++ b/config/cloudinit/datasource/metadata/gce/metadata.go @@ -21,7 +21,7 @@ import ( "strconv" "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/metadata" @@ -74,6 +74,7 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) { SSHPublicKeys: nil, } + /* Disabled, using DHCP like in pre-0.9.1 - missing gateway and netmask, and testing time addresses := []string{} if public != nil { 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["eth0"] = network } + */ keyStrings := strings.Split(projectSSHKeys+"\n"+instanceSSHKeys, "\n")