Skip to content

Enable scaleway-ipv6 flag #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 59 additions & 50 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ root@ab197ef8bd3c:/# exit

### master (unreleased)

* Add `--scaleway-ipv6` ([#50](https://github.com/scaleway/docker-machine-driver-scaleway/issues/50))
* Add `--scaleway-port`
* Add `--scaleway-user`

Expand Down
14 changes: 8 additions & 6 deletions driver/scaleway.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ type Driver struct {
IPPersistant bool
stopping bool
created bool
ipv6 bool
// userDataFile string
// ipv6 bool
}

// DriverName returns the name of the driver
Expand Down Expand Up @@ -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.ipv6 = flags.Bool("scaleway-ipv6")
d.BaseDriver.SSHUser = flags.String("scaleway-user")
d.BaseDriver.SSHPort = flags.Int("scaleway-port")
return
Expand Down Expand Up @@ -161,16 +162,16 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
Name: "scaleway-debug",
Usage: "Enables Scaleway client debugging",
},
mcnflag.BoolFlag{
EnvVar: "SCALEWAY_IPV6",
Name: "scaleway-ipv6",
Usage: "Enable ipv6",
},
// mcnflag.StringFlag{
// EnvVar: "SCALEWAY_USERDATA",
// Name: "scaleway-userdata",
// Usage: "Path to file with user-data",
// },
// mcnflag.BoolFlag{
// EnvVar: "SCALEWAY_IPV6",
// Name: "scaleway-ipv6",
// Usage: "Enable ipv6",
// },
}
}

Expand Down Expand Up @@ -249,6 +250,7 @@ func (d *Driver) Create() (err error) {
Bootscript: defaultBootscript,
AdditionalVolumes: d.volumes,
IP: d.IPID,
EnableIPV6: d.ipv6,
Env: strings.Join([]string{"AUTHORIZED_KEY",
strings.Replace(string(publicKey[:len(publicKey)-1]), " ", "_", -1)}, "="),
})
Expand Down
11 changes: 11 additions & 0 deletions vendor/github.com/creack/goselect/test_crosscompile.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions vendor/github.com/docker/docker/pkg/term/term_windows.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/github.com/dustin/go-humanize/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/dustin/go-humanize/README.markdown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading