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

Capitalise SSHWaitTimeout for consistency

Browse Source
This commit is contained in:
Cheng Sun 2014-12-08 16:12:18 +00:00
parent ee0d6d38e0
commit 1de826270c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/xenserver/builder.go
View File

@ -38,7 +38,7 @@ type config struct {
RawBootWait string `mapstructure:"boot_wait"` RawBootWait string `mapstructure:"boot_wait"`
BootWait time.Duration `` BootWait time.Duration ``
sshWaitTimeout time.Duration `` SSHWaitTimeout time.Duration ``
ISOChecksum string `mapstructure:"iso_checksum"` ISOChecksum string `mapstructure:"iso_checksum"`
ISOChecksumType string `mapstructure:"iso_checksum_type"` ISOChecksumType string `mapstructure:"iso_checksum_type"`
@ -161,7 +161,7 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, retErr error
errs, errors.New("Failed to parse boot_wait.")) errs, errors.New("Failed to parse boot_wait."))
} }
self.config.sshWaitTimeout, err = time.ParseDuration(self.config.RawSSHWaitTimeout) self.config.SSHWaitTimeout, err = time.ParseDuration(self.config.RawSSHWaitTimeout)
if err != nil { if err != nil {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
errs, fmt.Errorf("Failed to parse ssh_wait_timeout: %s", err)) errs, fmt.Errorf("Failed to parse ssh_wait_timeout: %s", err))
@ -352,7 +352,7 @@ func (self *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (pa
&common.StepConnectSSH{ &common.StepConnectSSH{
SSHAddress: sshLocalAddress, SSHAddress: sshLocalAddress,
SSHConfig: sshConfig, SSHConfig: sshConfig,
SSHWaitTimeout: self.config.sshWaitTimeout, SSHWaitTimeout: self.config.SSHWaitTimeout,
}, },
new(common.StepProvision), new(common.StepProvision),
new(stepShutdownAndExport), new(stepShutdownAndExport),