SSHKeyPath and SSHWaitTimeout have been deprecated in favor of communicator configuration

This commit is contained in:
Taliesin Sisson 2016-11-06 13:06:10 +00:00
parent c88a2ef872
commit 501845cb4f
1 changed files with 0 additions and 13 deletions

View File

@ -9,21 +9,8 @@ import (
type SSHConfig struct {
Comm communicator.Config `mapstructure:",squash"`
// These are deprecated, but we keep them around for BC
// TODO(@mitchellh): remove
SSHKeyPath string `mapstructure:"ssh_key_path"`
SSHWaitTimeout time.Duration `mapstructure:"ssh_wait_timeout"`
}
func (c *SSHConfig) Prepare(ctx *interpolate.Context) []error {
// TODO: backwards compatibility, write fixer instead
if c.SSHKeyPath != "" {
c.Comm.SSHPrivateKey = c.SSHKeyPath
}
if c.SSHWaitTimeout != 0 {
c.Comm.SSHTimeout = c.SSHWaitTimeout
}
return c.Comm.Prepare(ctx)
}