matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate configuration entry ssh_key_path

Browse Source 
The key ssh_key_path is already specified in ssh_config.go.
This commit is contained in:
flx5 2021-09-28 10:03:46 +02:00
parent 189cd46360
commit 9139994fdd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builder/xenserver/common/common_config.go
View File

@ -6,17 +6,17 @@ import (
"os" "os"
"time" "time"
"github.com/hashicorp/packer-plugin-sdk/common"
"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
"github.com/hashicorp/packer-plugin-sdk/multistep"
"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
"github.com/hashicorp/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer-plugin-sdk/bootcommand"
"github.com/hashicorp/packer-plugin-sdk/common"
"github.com/hashicorp/packer-plugin-sdk/multistep"
"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
xenapi "github.com/terra-farm/go-xen-api-client" xenapi "github.com/terra-farm/go-xen-api-client"
) )
type CommonConfig struct { type CommonConfig struct {
bootcommand.VNCConfig `mapstructure:",squash"` bootcommand.VNCConfig `mapstructure:",squash"`
commonsteps.HTTPConfig `mapstructure:",squash"` commonsteps.HTTPConfig `mapstructure:",squash"`
Username string `mapstructure:"remote_username"` Username string `mapstructure:"remote_username"`
Password string `mapstructure:"remote_password"` Password string `mapstructure:"remote_password"`
@ -33,7 +33,7 @@ type CommonConfig struct {
HostPortMin uint `mapstructure:"host_port_min"` HostPortMin uint `mapstructure:"host_port_min"`
HostPortMax uint `mapstructure:"host_port_max"` HostPortMax uint `mapstructure:"host_port_max"`
ShutdownCommand string `mapstructure:"shutdown_command"` ShutdownCommand string `mapstructure:"shutdown_command"`
RawBootWait string `mapstructure:"boot_wait"` RawBootWait string `mapstructure:"boot_wait"`
BootWait time.Duration BootWait time.Duration
@ -42,7 +42,6 @@ type CommonConfig struct {
// SSHHostPortMin uint `mapstructure:"ssh_host_port_min"` // SSHHostPortMin uint `mapstructure:"ssh_host_port_min"`
// SSHHostPortMax uint `mapstructure:"ssh_host_port_max"` // SSHHostPortMax uint `mapstructure:"ssh_host_port_max"`
SSHKeyPath string `mapstructure:"ssh_key_path"`
SSHPassword string `mapstructure:"ssh_password"` SSHPassword string `mapstructure:"ssh_password"`
SSHPort uint `mapstructure:"ssh_port"` SSHPort uint `mapstructure:"ssh_port"`
SSHUser string `mapstructure:"ssh_username"` SSHUser string `mapstructure:"ssh_username"`