Skip to content

Commit a168436

Browse files
authored
Merge pull request #185 from jakefhyde/37510-digitalocean-private-ip
Implemented private ip for digital ocean driver
2 parents 5552dee + 68b3f38 commit a168436

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

drivers/digitalocean/digitalocean.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ type Driver struct {
3838
UserDataFile string
3939
Monitoring bool
4040
Tags string
41+
PrivateIPAddress string
4142
}
4243

4344
const (
4445
defaultSSHPort = 22
4546
defaultSSHUser = "root"
46-
defaultImage = "ubuntu-16-04-x64"
47+
defaultImage = "ubuntu-20-04-x64"
4748
defaultRegion = "nyc3"
4849
defaultSize = "s-1vcpu-1gb"
4950
)
@@ -264,18 +265,22 @@ func (d *Driver) Create() error {
264265
if network.Type == "public" {
265266
d.IPAddress = network.IPAddress
266267
}
268+
if d.PrivateNetworking && network.Type == "private" {
269+
d.PrivateIPAddress = network.IPAddress
270+
}
267271
}
268272

269-
if d.IPAddress != "" {
273+
if d.IPAddress != "" && (!d.PrivateNetworking || d.PrivateIPAddress != "") {
270274
break
271275
}
272276

273277
time.Sleep(5 * time.Second)
274278
}
275279

276-
log.Debugf("Created droplet ID %d, IP address %s",
280+
log.Debugf("Created droplet ID %d, IP address %s, Private IP address %s",
277281
newDroplet.ID,
278-
d.IPAddress)
282+
d.IPAddress,
283+
d.PrivateIPAddress)
279284

280285
return nil
281286
}

0 commit comments

Comments
 (0)