docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

amazonec2: add SSHUser to driver 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-03-11 22:04:52 -04:00
parent c6ca050653
commit 645bf8ab90
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/amazonec2/amazonec2.go
View File

@ -43,6 +43,7 @@ type Driver struct {
Region string
AMI string
SSHKeyID int
SSHUser string
SSHPort int
KeyName string
InstanceId string
@ -209,6 +210,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.SwarmMaster = flags.Bool("swarm-master")
d.SwarmHost = flags.String("swarm-host")
d.SwarmDiscovery = flags.String("swarm-discovery")
d.SSHUser = "ubuntu"
d.SSHPort = 22
if d.AccessKey == "" {
@ -429,7 +431,7 @@ func (d *Driver) GetSSHPort() (int, error) {
}
func (d *Driver) GetSSHUsername() string {
return "ubuntu"
return d.SSHUser
}
func (d *Driver) Start() error {