Merge pull request #4749 from rickard-von-essen/issue-4608
builder/googlecompute: Revert to using default service account
This commit is contained in:
commit
4a38f0d353
|
@ -73,7 +73,6 @@ type InstanceConfig struct {
|
|||
Preemptible bool
|
||||
Region string
|
||||
Scopes []string
|
||||
ServiceAccountEmail string
|
||||
Subnetwork string
|
||||
Tags []string
|
||||
Zone string
|
||||
|
|
|
@ -391,7 +391,7 @@ func (d *driverGCE) RunInstance(c *InstanceConfig) (<-chan error, error) {
|
|||
},
|
||||
ServiceAccounts: []*compute.ServiceAccount{
|
||||
{
|
||||
Email: c.ServiceAccountEmail,
|
||||
Email: "default",
|
||||
Scopes: c.Scopes,
|
||||
},
|
||||
},
|
||||
|
|
|
@ -113,7 +113,6 @@ func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
|
|||
OnHostMaintenance: c.OnHostMaintenance,
|
||||
Preemptible: c.Preemptible,
|
||||
Region: c.Region,
|
||||
ServiceAccountEmail: c.Account.ClientEmail,
|
||||
Scopes: c.Scopes,
|
||||
Subnetwork: c.Subnetwork,
|
||||
Tags: c.Tags,
|
||||
|
|
Loading…
Reference in New Issue