iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4749 from rickard-von-essen/issue-4608 

builder/googlecompute: Revert to using default service account
This commit is contained in:
Matthew Hooker 2017-04-03 11:22:34 -07:00 committed by GitHub
parent 7f8f24e126 bce03492d9
commit 4a38f0d353
3 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/googlecompute/driver.go
View File

@ -73,7 +73,6 @@ type InstanceConfig struct {
Preemptible bool Preemptible bool
Region string Region string
Scopes []string Scopes []string
ServiceAccountEmail string
Subnetwork string Subnetwork string
Tags []string Tags []string
Zone string Zone string

2
builder/googlecompute/driver_gce.go
View File

@ -391,7 +391,7 @@ func (d *driverGCE) RunInstance(c *InstanceConfig) (<-chan error, error) {
}, },
ServiceAccounts: []*compute.ServiceAccount{ ServiceAccounts: []*compute.ServiceAccount{
{ {
Email: c.ServiceAccountEmail, Email: "default",
Scopes: c.Scopes, Scopes: c.Scopes,
}, },
}, },

1
builder/googlecompute/step_create_instance.go
View File

@ -113,7 +113,6 @@ func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
OnHostMaintenance: c.OnHostMaintenance, OnHostMaintenance: c.OnHostMaintenance,
Preemptible: c.Preemptible, Preemptible: c.Preemptible,
Region: c.Region, Region: c.Region,
ServiceAccountEmail: c.Account.ClientEmail,
Scopes: c.Scopes, Scopes: c.Scopes,
Subnetwork: c.Subnetwork, Subnetwork: c.Subnetwork,
Tags: c.Tags, Tags: c.Tags,