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

remove unneeded keypair var

This commit is contained in:
Matthew Hooker 2017-05-01 10:17:21 -07:00
parent 602fd64c5d
commit 80d6cd91fd
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builder/amazon/common/step_key_pair.go
View File

@ -19,7 +19,6 @@ type StepKeyPair struct {
KeyPairName string
PrivateKeyFile string
keyName string
doCleanup bool
}
@ -68,12 +67,10 @@ func (s *StepKeyPair) Run(state multistep.StateBag) multistep.StepAction {
return multistep.ActionHalt
}
// Set the keyname so we know to delete it later
s.keyName = s.TemporaryKeyPairName
s.doCleanup = true
// Set some state data for use in future steps
state.Put("keyPair", s.keyName)
state.Put("keyPair", s.TemporaryKeyPairName)
state.Put("privateKey", *keyResp.KeyMaterial)
// If we're in debug mode, output the private key to the working
@ -115,10 +112,10 @@ func (s *StepKeyPair) Cleanup(state multistep.StateBag) {
// Remove the keypair
ui.Say("Deleting temporary keypair...")
_, err := ec2conn.DeleteKeyPair(&ec2.DeleteKeyPairInput{KeyName: &s.keyName})
_, err := ec2conn.DeleteKeyPair(&ec2.DeleteKeyPairInput{KeyName: &s.TemporaryKeyPairName})
if err != nil {
ui.Error(fmt.Sprintf(
"Error cleaning up keypair. Please delete the key manually: %s", s.keyName))
"Error cleaning up keypair. Please delete the key manually: %s", s.TemporaryKeyPairName))
}
// Also remove the physical key if we're debugging.

10
builder/openstack/step_key_pair.go
View File

@ -22,7 +22,6 @@ type StepKeyPair struct {
KeyPairName string
PrivateKeyFile string
keyName string
doCleanup bool
}
@ -85,7 +84,6 @@ func (s *StepKeyPair) Run(state multistep.StateBag) multistep.StepAction {
}
ui.Say(fmt.Sprintf("Created temporary keypair: %s", s.TemporaryKeyPairName))
s.doCleanup = true
keypair.PrivateKey = berToDer(keypair.PrivateKey, ui)
@ -115,11 +113,11 @@ func (s *StepKeyPair) Run(state multistep.StateBag) multistep.StepAction {
}
}
// Set the keyname so we know to delete it later
s.keyName = s.TemporaryKeyPairName
// we created a temporary key, so remember to clean it up
s.doCleanup = true
// Set some state data for use in future steps
state.Put("keyPair", s.keyName)
state.Put("keyPair", s.TemporaryKeyPairName)
state.Put("privateKey", keypair.PrivateKey)
return multistep.ActionContinue
@ -185,7 +183,7 @@ func (s *StepKeyPair) Cleanup(state multistep.StateBag) {
}
ui.Say(fmt.Sprintf("Deleting temporary keypair: %s ...", s.TemporaryKeyPairName))
err = keypairs.Delete(computeClient, s.keyName).ExtractErr()
err = keypairs.Delete(computeClient, s.TemporaryKeyPairName).ExtractErr()
if err != nil {
ui.Error(fmt.Sprintf(
"Error cleaning up keypair. Please delete the key manually: %s", s.TemporaryKeyPairName))