make ssh username configurable for ec2

Signed-off-by: wlan0 <sidharthamn@gmail.com>
This commit is contained in:
wlan0
2015-04-07 14:31:27 -07:00
parent cbbf0ec0eb
commit ee941e979b
2 changed files with 8 additions and 1 deletions
+7 -1
View File
@@ -146,6 +146,12 @@ func GetCreateFlags() []cli.Flag {
Name: "amazonec2-iam-instance-profile",
Usage: "AWS IAM Instance Profile",
},
cli.StringFlag{
Name: "amazonec2-ssh-user",
Usage: "set the name of the ssh user",
Value: "ubuntu",
EnvVar: "AWS_SSH_USER",
},
}
}
@@ -199,7 +205,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.SSHUser = flags.String("amazonec2-ssh-user")
d.SSHPort = 22
if d.AccessKey == "" {
+1
View File
@@ -77,6 +77,7 @@ func getDefaultTestDriverFlags() *DriverOptionsMock {
"amazonec2-zone": "e",
"amazonec2-root-size": 10,
"amazonec2-iam-instance-profile": "",
"amazonec2-ssh-user": "ubuntu",
},
}
}