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

builder/googlecompute: Store empty public_key

This commit is contained in:
Lars Wander 2016-11-03 12:49:09 -04:00
parent 7f474d8f78
commit 583e341ae7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/googlecompute/step_create_instance.go
View File

@ -69,13 +69,9 @@ func getImage(c *Config, d Driver) (*Image, error) {
func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction { func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction {
c := state.Get("config").(*Config) c := state.Get("config").(*Config)
d := state.Get("driver").(Driver) d := state.Get("driver").(Driver)
sshPublicKey := state.Get("ssh_public_key").(string)
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
sshPublicKey := ""
if sshPublicKeyRaw, ok := state.GetOk("ssh_public_key"); ok {
sshPublicKey = sshPublicKeyRaw.(string)
}
sourceImage, err := getImage(c, d) sourceImage, err := getImage(c, d)
if err != nil { if err != nil {
err := fmt.Errorf("Error getting source image for instance creation: %s", err) err := fmt.Errorf("Error getting source image for instance creation: %s", err)

1
builder/googlecompute/step_create_ssh_key.go
View File

@ -37,6 +37,7 @@ func (s *StepCreateSSHKey) Run(state multistep.StateBag) multistep.StepAction {
} }
state.Put("ssh_private_key", string(privateKeyBytes)) state.Put("ssh_private_key", string(privateKeyBytes))
state.Put("ssh_public_key", "")
return multistep.ActionContinue return multistep.ActionContinue
} }