Merge pull request #44 from QuentinPerez/user

Add --scaleway-user

Author: Quentin Perez

README.md

@@ -66,6 +66,7 @@ Options:
    --scaleway-name                                                                                   Assign a name [$SCALEWAY_NAME]
    --scaleway-organization                                                                           Scaleway organization [$SCALEWAY_ORGANIZATION]
    --scaleway-token                                                                                  Scaleway token [$SCALEWAY_TOKEN]
+   --scaleway-user "root"                                                                            Specifies SSH user name [$SCALEWAY_USER]
    --scaleway-volumes                                                                                Attach additional volume (e.g., 50G) [$SCALEWAY_VOLUMES]
    --swarm                                                                                           Configure Machine with Swarm
    --swarm-addr                                                                                      addr to advertise for Swarm (default: detect and use the machine IP)
@@ -187,7 +188,7 @@ More [examples](https://github.com/scaleway/docker-machine-driver-scaleway/tree/
 
 ### master (unreleased)
 
-* No entry
+* Add `--scaleway-user`
 
 View full [commits list](https://github.com/scaleway/docker-machine-driver-scaleway/compare/v1.2.1...master)
 

driver/scaleway.go

@@ -90,6 +90,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
 	d.image = flags.String("scaleway-image")
 	d.ip = flags.String("scaleway-ip")
 	d.volumes = flags.String("scaleway-volumes")
+	d.BaseDriver.SSHUser = flags.String("scaleway-user")
 	return
 }
 
@@ -142,6 +143,12 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Attach additional volume (e.g., 50G)",
 			Value:  "",
 		},
+		mcnflag.StringFlag{
+			EnvVar: "SCALEWAY_USER",
+			Name:   "scaleway-user",
+			Usage:  "Specifies SSH user name",
+			Value:  drivers.DefaultSSHUser,
+		},
 		mcnflag.BoolFlag{
 			EnvVar: "SCALEWAY_DEBUG",
 			Name:   "scaleway-debug",