Skip to content

Commit ac573ef

Browse files
authored
Merge pull request #51 from QuentinPerez/enable-ipv6
Enable scaleway-ipv6 flag
2 parents e8faf25 + 2db96ad commit ac573ef

File tree

102 files changed

+8666
-3047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+8666
-3047
lines changed

Godeps/Godeps.json

Lines changed: 59 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ root@ab197ef8bd3c:/# exit
240240

241241
### master (unreleased)
242242

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

driver/scaleway.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ type Driver struct {
4444
IPPersistant bool
4545
stopping bool
4646
created bool
47+
ipv6 bool
4748
// userDataFile string
48-
// ipv6 bool
4949
}
5050

5151
// DriverName returns the name of the driver
@@ -90,6 +90,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) (err error) {
9090
d.image = flags.String("scaleway-image")
9191
d.ip = flags.String("scaleway-ip")
9292
d.volumes = flags.String("scaleway-volumes")
93+
d.ipv6 = flags.Bool("scaleway-ipv6")
9394
d.BaseDriver.SSHUser = flags.String("scaleway-user")
9495
d.BaseDriver.SSHPort = flags.Int("scaleway-port")
9596
return
@@ -161,16 +162,16 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
161162
Name: "scaleway-debug",
162163
Usage: "Enables Scaleway client debugging",
163164
},
165+
mcnflag.BoolFlag{
166+
EnvVar: "SCALEWAY_IPV6",
167+
Name: "scaleway-ipv6",
168+
Usage: "Enable ipv6",
169+
},
164170
// mcnflag.StringFlag{
165171
// EnvVar: "SCALEWAY_USERDATA",
166172
// Name: "scaleway-userdata",
167173
// Usage: "Path to file with user-data",
168174
// },
169-
// mcnflag.BoolFlag{
170-
// EnvVar: "SCALEWAY_IPV6",
171-
// Name: "scaleway-ipv6",
172-
// Usage: "Enable ipv6",
173-
// },
174175
}
175176
}
176177

@@ -249,6 +250,7 @@ func (d *Driver) Create() (err error) {
249250
Bootscript: defaultBootscript,
250251
AdditionalVolumes: d.volumes,
251252
IP: d.IPID,
253+
EnableIPV6: d.ipv6,
252254
Env: strings.Join([]string{"AUTHORIZED_KEY",
253255
strings.Replace(string(publicKey[:len(publicKey)-1]), " ", "_", -1)}, "="),
254256
})

vendor/github.com/creack/goselect/test_crosscompile.sh

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/pkg/term/term_windows.go

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dustin/go-humanize/.travis.yml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dustin/go-humanize/README.markdown

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)