rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-02 01:31:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1765 from rancher/use-dhcp-on-gce

Browse Source 
Disable GCE ip address metadata - it needs work
This commit is contained in:
Sven Dowideit 2017-04-11 19:34:57 +10:00 committed by GitHub
commit f28d658cda
3 changed files with 11 additions and 3 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")

8
scripts/ci
View File

@ -1,13 +1,19 @@
#!/bin/bash #!/bin/bash
set -e #set -e
cd $(dirname $0)/.. cd $(dirname $0)/..
echo BUILD
./scripts/build ./scripts/build
echo TEST
./scripts/test ./scripts/test
echo VALIDATE
./scripts/validate ./scripts/validate
echo PREPARE
./scripts/prepare ./scripts/prepare
echo PACKAGE
./scripts/package ./scripts/package
echo INTEGRATION-TEST
./scripts/integration-test ./scripts/integration-test
echo "--- Run" echo "--- Run"

2
scripts/test
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# help: Run go unit tests # help: Run go unit tests
set -e #set -e
cd $(dirname $0)/.. cd $(dirname $0)/..