diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-02-27 11:58:41 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-02-27 11:58:41 +0100 |
| commit | 64482eb94884b3d18789276e1fc7b4776a2e7c74 (patch) | |
| tree | f0256bafe10dfad361fec88b64010c71aeabfa7a | |
| parent | 6d41d29ecdde31f770663992e7d3948618f62434 (diff) | |
pkg/gce: use current instance network
The current instance is not necessary in the default network.
| -rw-r--r-- | pkg/gce/gce.go | 7 | ||||
| -rw-r--r-- | vm/gce/gce.go | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkg/gce/gce.go b/pkg/gce/gce.go index d449d87ba..93dc65557 100644 --- a/pkg/gce/gce.go +++ b/pkg/gce/gce.go @@ -31,6 +31,8 @@ type Context struct { Instance string InternalIP string ExternalIP string + Network string + Subnetwork string computeService *compute.Service @@ -80,6 +82,8 @@ func NewContext() (*Context, error) { ctx.ExternalIP = ac.NatIP } } + ctx.Network = iface.Network + ctx.Subnetwork = iface.Network } if ctx.InternalIP == "" { return nil, fmt.Errorf("failed to get current instance internal IP") @@ -121,7 +125,8 @@ func (ctx *Context) CreateInstance(name, machineType, image, sshkey string) (str }, NetworkInterfaces: []*compute.NetworkInterface{ &compute.NetworkInterface{ - Network: "global/networks/default", + Network: ctx.Network, + Subnetwork: ctx.Subnetwork, }, }, Scheduling: &compute.Scheduling{ diff --git a/vm/gce/gce.go b/vm/gce/gce.go index 01cbc7bd4..5be790b76 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -96,8 +96,8 @@ func ctor(env *vmimpl.Env) (vmimpl.Pool, error) { if err != nil { return nil, fmt.Errorf("failed to init gce: %v", err) } - Logf(0, "GCE initialized: running on %v, internal IP %v, project %v, zone %v", - GCE.Instance, GCE.InternalIP, GCE.ProjectID, GCE.ZoneID) + Logf(0, "GCE initialized: running on %v, internal IP %v, project %v, zone %v, net %v/%v", + GCE.Instance, GCE.InternalIP, GCE.ProjectID, GCE.ZoneID, GCE.Network, GCE.Subnetwork) if cfg.GCE_Image == "" { cfg.GCE_Image = env.Name |