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

PrivateKey => PrivateKeyFile

This commit is contained in:
Adrien Delorme 2018-08-27 16:31:28 +02:00
parent 324c46279b
commit 25de7ad1f2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/vmware/iso/driver.go
View File

@ -21,7 +21,7 @@ func NewDriver(config *Config) (vmwcommon.Driver, error) {
Port: config.RemotePort, Port: config.RemotePort,
Username: config.RemoteUser, Username: config.RemoteUser,
Password: config.RemotePassword, Password: config.RemotePassword,
PrivateKey: config.RemotePrivateKey, PrivateKeyFile: config.RemotePrivateKey,
Datastore: config.RemoteDatastore, Datastore: config.RemoteDatastore,
CacheDatastore: config.RemoteCacheDatastore, CacheDatastore: config.RemoteCacheDatastore,
CacheDirectory: config.RemoteCacheDirectory, CacheDirectory: config.RemoteCacheDirectory,

6
builder/vmware/iso/driver_esx5.go
View File

@ -31,7 +31,7 @@ type ESX5Driver struct {
Port uint Port uint
Username string Username string
Password string Password string
PrivateKey string PrivateKeyFile string
Datastore string Datastore string
CacheDatastore string CacheDatastore string
CacheDirectory string CacheDirectory string
@ -514,8 +514,8 @@ func (d *ESX5Driver) connect() error {
ssh.PasswordKeyboardInteractive(d.Password)), ssh.PasswordKeyboardInteractive(d.Password)),
} }
if d.PrivateKey != "" { if d.PrivateKeyFile != "" {
signer, err := helperssh.FileSigner(d.PrivateKey) signer, err := helperssh.FileSigner(d.PrivateKeyFile)
if err != nil { if err != nil {
return err return err
} }