mirror of https://github.com/docker/docs.git
Remove useless duplication on GetSSHHostname
Signed-off-by: Olivier Gambier <olivier@docker.com>
This commit is contained in:
parent
c2589c8099
commit
b6462eb6d0
|
@ -452,12 +452,6 @@ func (d *Driver) GetState() (state.State, error) {
|
|||
}
|
||||
}
|
||||
|
||||
// GetSSHHostname -
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
// TODO: use @nathanleclaire retry func here (ehazlett)
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
if d.SSHUser == "" {
|
||||
d.SSHUser = "ubuntu"
|
||||
|
|
|
@ -119,10 +119,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
|
|||
return d
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
if d.SSHUser == "" {
|
||||
d.SSHUser = "ubuntu"
|
||||
|
|
|
@ -97,10 +97,6 @@ func NewDriver(hostName, storePath string) *Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) DriverName() string {
|
||||
return "digitalocean"
|
||||
}
|
||||
|
|
|
@ -103,10 +103,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
return "ubuntu"
|
||||
}
|
||||
|
|
|
@ -72,10 +72,6 @@ func (d *Driver) DriverName() string {
|
|||
return "generic"
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
return d.SSHUser
|
||||
}
|
||||
|
|
|
@ -120,11 +120,6 @@ func NewDriver(machineName string, storePath string) *Driver {
|
|||
}
|
||||
}
|
||||
|
||||
// GetSSHHostname returns hostname for use with ssh
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
// GetSSHUsername returns username for use with ssh
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
if d.SSHUser == "" {
|
||||
|
|
|
@ -85,10 +85,6 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
if d.SSHUser == "" {
|
||||
d.SSHUser = "docker"
|
||||
|
|
|
@ -218,10 +218,6 @@ func NewDerivedDriver(hostName, storePath string) *Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) DriverName() string {
|
||||
return "openstack"
|
||||
}
|
||||
|
|
|
@ -73,10 +73,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetCreateFlags() []mcnflag.Flag {
|
||||
// Set hourly billing to true by default since codegangsta cli doesn't take default bool values
|
||||
if os.Getenv("SOFTLAYER_HOURLY_BILLING") == "" {
|
||||
|
|
|
@ -119,10 +119,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
if d.SSHUser == "" {
|
||||
d.SSHUser = "docker"
|
||||
|
|
|
@ -138,10 +138,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
// Driver interface implementation
|
||||
func (d *Driver) DriverName() string {
|
||||
return "vmwarevcloudair"
|
||||
|
|
|
@ -135,10 +135,6 @@ func NewDriver(hostName, storePath string) drivers.Driver {
|
|||
}
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHHostname() (string, error) {
|
||||
return d.GetIP()
|
||||
}
|
||||
|
||||
func (d *Driver) GetSSHUsername() string {
|
||||
if d.SSHUser == "" {
|
||||
d.SSHUser = "docker"
|
||||
|
|
Loading…
Reference in New Issue