Implement --ddcloud-image-name command-line argument (#3).

Author: tintoy

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.2
+VERSION = 0.3
 
 default: fmt build test
 

README.md

@@ -39,6 +39,8 @@ Environment: `DD_COMPUTE_REGION`.
 * `ddcloud-networkdomain` - The name of the target CloudControl network domain.
 * `ddcloud-datacenter` - The name of the CloudControl datacenter (e.g. NA1, AU9) in which the network domain is located.
 * `ddcloud-vlan` - The name of the target CloudControl VLAN.
+* `ddcloud-image-name` - The name of the OS image used to create the target machine.  
+Note that only OS images are supported for now, not customer images. Additionally, the OS must be a Linux distribution supported by docker-machine.
 * `ddcloud-ssh-user` - The SSH username to use.  
 Default: "root".  
 Environment: `DD_COMPUTE_SSH_USER`

client.go

@@ -203,11 +203,6 @@ func (driver *Driver) getOSImage() (*compute.OSImage, error) {
 func (driver *Driver) resolveOSImage() error {
 	driver.ImageID = ""
 
-	networkDomain, err := driver.getNetworkDomain()
-	if err != nil {
-		return err
-	}
-
 	client, err := driver.getCloudControlClient()
 	if err != nil {
 		return err
@@ -218,9 +213,17 @@ func (driver *Driver) resolveOSImage() error {
 		return err
 	}
 	if image == nil {
-		log.Errorf("OS image '%s' was not found in data centre '%s'.", driver.ImageName, networkDomain.DatacenterID)
+		log.Errorf("OS image '%s' was not found in data centre '%s'.", driver.ImageName, driver.DataCenterID)
+
+		return fmt.Errorf("OS image '%s' was not found in data centre '%s'", driver.ImageName, driver.DataCenterID)
+	}
 
-		return fmt.Errorf("OS image '%s' was not found in data centre '%s'", driver.ImageName, networkDomain.DatacenterID)
+	if image.OperatingSystem.Family != "UNIX" {
+		return fmt.Errorf("OS image '%s' in data centre '%s' is not from a supported OS family (expected 'UNIX', but found '%s')",
+			driver.ImageName,
+			driver.DataCenterID,
+			image.OperatingSystem.Family,
+		)
 	}
 
 	driver.ImageID = image.ID

driver.go

@@ -116,6 +116,11 @@ func (driver *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage: "The name of the target CloudControl VLAN",
 			Value: "",
 		},
+		mcnflag.StringFlag{
+			Name:  "ddcloud-image-name",
+			Usage: fmt.Sprintf(`The name of OS image used to create the target machine. Default: "%s"`, DefaultImageName),
+			Value: DefaultImageName,
+		},
 		mcnflag.StringFlag{
 			EnvVar: "DD_COMPUTE_SSH_USER",
 			Name:   "ddcloud-ssh-user",
@@ -161,7 +166,7 @@ func (driver *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	driver.NetworkDomainName = flags.String("ddcloud-networkdomain")
 	driver.DataCenterID = flags.String("ddcloud-datacenter")
 	driver.VLANName = flags.String("ddcloud-vlan")
-	driver.ImageName = DefaultImageName
+	driver.ImageName = flags.String("ddcloud-image-name")
 
 	driver.SSHPort = flags.Int("ddcloud-ssh-port")
 	driver.SSHUser = flags.String("ddcloud-ssh-user")