Enable specifying a custom private IPv4 address for the server.

Author: tintoy

CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## v0.9.2
+
+Enhancements:
+
+* Can now specify a custom private IPv4 address for the server.
+
 ## v0.9.1
 
 Bug fixes:

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.9.1
+VERSION = 0.9.2
 
 default: fmt build test
 

client.go

@@ -284,6 +284,17 @@ func (driver *Driver) buildDeploymentConfiguration() (deploymentConfiguration co
 		return
 	}
 
+	// Specify private IPv4 address or VLAN Id.
+	var (
+		vlanID             *string
+		privateIPv4Address *string
+	)
+	if driver.PrivateIPAddress != "" {
+		privateIPv4Address = &driver.PrivateIPAddress
+	} else {
+		vlanID = &driver.VLANID
+	}
+
 	deploymentConfiguration = compute.ServerDeploymentConfiguration{
 		Name:                  driver.MachineName,
 		Description:           fmt.Sprintf("%s (created by Docker Machine).", driver.MachineName),
@@ -292,7 +303,8 @@ func (driver *Driver) buildDeploymentConfiguration() (deploymentConfiguration co
 		Network: compute.VirtualMachineNetwork{
 			NetworkDomainID: driver.NetworkDomainID,
 			PrimaryAdapter: compute.VirtualMachineNetworkAdapter{
-				VLANID: &driver.VLANID,
+				VLANID:             vlanID,
+				PrivateIPv4Address: privateIPv4Address,
 			},
 		},
 		PrimaryDNS:   "8.8.8.8",

driver.go

@@ -137,6 +137,11 @@ func (driver *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage: "The name of the target CloudControl VLAN",
 			Value: "",
 		},
+		mcnflag.StringFlag{
+			Name:  "ddcloud-private-ipv4",
+			Usage: "An optional IPv4 address for the server",
+			Value: "",
+		},
 		mcnflag.StringFlag{
 			Name:  "ddcloud-image-name",
 			Usage: fmt.Sprintf(`The name of OS image used to create the target machine. Default: "%s"`, DefaultImageName),
@@ -198,6 +203,8 @@ func (driver *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 
 	driver.NetworkDomainName = flags.String("ddcloud-networkdomain")
 	driver.DataCenterID = flags.String("ddcloud-datacenter")
+	driver.PrivateIPAddress = flags.String("ddcloud-private-ipv4")
+	driver.VLANName = flags.String("ddcloud-vlan")
 	driver.VLANName = flags.String("ddcloud-vlan")
 	driver.ImageName = flags.String("ddcloud-image-name")