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

Revert "Fix bugs" 

This reverts commit 02139dcb69 that constitutes pr #6701
This commit is contained in:
Adrien Delorme 2018-09-18 16:22:17 +02:00
parent 016b0985a6
commit 37c6f08abe
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/openstack/builder.go
View File

@ -110,7 +110,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
ConfigDrive: b.config.ConfigDrive,
InstanceMetadata: b.config.InstanceMetadata,
UseBlockStorageVolume: b.config.UseBlockStorageVolume,
Comm: &b.config.Comm,
},
&StepGetPassword{
Debug: b.config.PackerDebug,

4
builder/openstack/step_run_source_server.go
View File

@ -9,7 +9,6 @@ import (
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/hashicorp/packer/helper/communicator"
"github.com/hashicorp/packer/helper/multistep"
"github.com/hashicorp/packer/packer"
)
@ -26,7 +25,6 @@ type StepRunSourceServer struct {
InstanceMetadata map[string]string
UseBlockStorageVolume bool
server *servers.Server
Comm *communicator.Config
}
func (s *StepRunSourceServer) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
@ -102,7 +100,7 @@ func (s *StepRunSourceServer) Run(_ context.Context, state multistep.StateBag) m
}
// Add keypair to the server create options.
keyName := s.Comm.SSHKeyPairName
keyName := config.Comm.SSHKeyPairName
if keyName != "" {
serverOptsExt = keypairs.CreateOptsExt{
CreateOptsBuilder: serverOptsExt,