diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go index 56dd2a3c95..88f89915bb 100644 --- a/drivers/amazonec2/amazonec2.go +++ b/drivers/amazonec2/amazonec2.go @@ -427,10 +427,18 @@ func (d *Driver) GetSSHHostname() (string, error) { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "ubuntu" + } + return d.SSHUser } diff --git a/drivers/azure/azure.go b/drivers/azure/azure.go index df6e6fcac6..6e10b051b7 100644 --- a/drivers/azure/azure.go +++ b/drivers/azure/azure.go @@ -138,10 +138,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "ubuntu" + } + return d.SSHUser } diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go index c759352a79..50cc3dc3b6 100644 --- a/drivers/digitalocean/digitalocean.go +++ b/drivers/digitalocean/digitalocean.go @@ -122,10 +122,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "root" + } + return d.SSHUser } diff --git a/drivers/google/google.go b/drivers/google/google.go index be3543bd74..832276d14f 100644 --- a/drivers/google/google.go +++ b/drivers/google/google.go @@ -129,10 +129,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "docker-user" + } + return d.SSHUser } diff --git a/drivers/hyperv/hyperv_windows.go b/drivers/hyperv/hyperv_windows.go index 3b9e91d806..26bdd95c57 100644 --- a/drivers/hyperv/hyperv_windows.go +++ b/drivers/hyperv/hyperv_windows.go @@ -115,10 +115,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "docker" + } + return d.SSHUser } diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go index 06920eb495..261b4b47ca 100644 --- a/drivers/openstack/openstack.go +++ b/drivers/openstack/openstack.go @@ -224,10 +224,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "root" + } + return d.SSHUser } diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go index 26dc61b1d4..74f11eabd7 100644 --- a/drivers/softlayer/driver.go +++ b/drivers/softlayer/driver.go @@ -82,10 +82,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "root" + } + return d.SSHUser } diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go index a55ed60d02..8e7005d72d 100644 --- a/drivers/virtualbox/virtualbox.go +++ b/drivers/virtualbox/virtualbox.go @@ -110,6 +110,10 @@ func (d *Driver) GetSSHPort() (int, error) { } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "docker" + } + return d.SSHUser } diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go index 4018387dad..d52d9b8bdc 100644 --- a/drivers/vmwarefusion/fusion_darwin.go +++ b/drivers/vmwarefusion/fusion_darwin.go @@ -118,10 +118,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "docker" + } + return d.SSHUser } diff --git a/drivers/vmwarevcloudair/vcloudair.go b/drivers/vmwarevcloudair/vcloudair.go index 3e828e6b15..2560cc0510 100644 --- a/drivers/vmwarevcloudair/vcloudair.go +++ b/drivers/vmwarevcloudair/vcloudair.go @@ -189,10 +189,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "root" + } + return d.SSHUser } diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go index 936561889e..5fcdb92b4b 100644 --- a/drivers/vmwarevsphere/vsphere.go +++ b/drivers/vmwarevsphere/vsphere.go @@ -181,10 +181,18 @@ func (d *Driver) GetSSHKeyPath() string { } func (d *Driver) GetSSHPort() (int, error) { + if d.SSHPort == 0 { + d.SSHPort = 22 + } + return d.SSHPort, nil } func (d *Driver) GetSSHUsername() string { + if d.SSHUser == "" { + d.SSHUser = "docker" + } + return d.SSHUser }