Initial support for deploying from customer image.

Author: tintoy

CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## v0.9.4
+
+Enhancements:
+
+* Support for using either OS or customer images.
+
 ## v0.9.3
 
 Enhancements:

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.9.3
+VERSION = 0.9.4
 
 default: fmt build test
 

README.md

@@ -40,8 +40,7 @@ Environment: `MCP_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.
+* `ddcloud-image-name` - The name of the image used to create the target machine.
 Additionally, the OS must be a Linux distribution supported by docker-machine (Ubuntu 12.04 and above are supported, but RedHat 6 and 7 are not supported due to iptables configuration issues).
 * `ddcloud-ssh-user` - The SSH username to use.
 Default: "root".

client.go

@@ -188,49 +188,68 @@ func (driver *Driver) resolveVLAN() error {
 	return nil
 }
 
-// Retrieve the target OS image.
-func (driver *Driver) getOSImage() (*compute.OSImage, error) {
+// Retrieve the target image.
+func (driver *Driver) getImage() (image compute.Image, err error) {
 	if driver.ImageID == "" {
 		return nil, errors.New("Image Id has not been resolved")
 	}
 
-	client, err := driver.getCloudControlClient()
+	var client *compute.Client
+	client, err = driver.getCloudControlClient()
 	if err != nil {
 		return nil, err
 	}
 
-	return client.GetOSImage(driver.ImageID)
+	image, err = client.GetOSImage(driver.ImageID)
+	if err != nil {
+		return
+	}
+	if image == nil {
+		image, err = client.GetCustomerImage(driver.ImageID)
+		if err != nil {
+			return
+		}
+	}
+
+	return
 }
 
-// Resolve (find) the target OS image.
-func (driver *Driver) resolveOSImage() error {
+// Resolve (find) the target image.
+func (driver *Driver) resolveImage() error {
 	driver.ImageID = ""
 
 	client, err := driver.getCloudControlClient()
 	if err != nil {
 		return err
 	}
 
-	image, err := client.FindOSImage(driver.ImageName, driver.DataCenterID)
+	var image compute.Image
+	image, err = client.FindOSImage(driver.ImageName, driver.DataCenterID)
 	if err != nil {
 		return err
 	}
 	if image == nil {
-		log.Errorf("OS image '%s' was not found in data centre '%s'.", driver.ImageName, driver.DataCenterID)
+		image, err = client.FindCustomerImage(driver.ImageName, driver.DataCenterID)
+		if err != nil {
+			return err
+		}
+	}
+	if image == nil {
+		log.Errorf("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("Image '%s' was not found in data centre '%s'", driver.ImageName, driver.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')",
+	if image.GetOS().Family != "UNIX" {
+		return fmt.Errorf("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,
+			image.GetOS().Family,
 		)
 	}
 
-	driver.ImageID = image.ID
-	driver.ImageOSType = image.OperatingSystem.ID
+	driver.ImageID = image.GetID()
+	driver.ImageOSType = image.GetOS().ID
 
 	return nil
 }
@@ -273,8 +292,8 @@ func (driver *Driver) deployServer() (*compute.Server, error) {
 
 // Build a deployment configuration for the target server.
 func (driver *Driver) buildDeploymentConfiguration() (deploymentConfiguration compute.ServerDeploymentConfiguration, err error) {
-	var image *compute.OSImage
-	image, err = driver.getOSImage()
+	var image compute.Image
+	image, err = driver.getImage()
 	if err != nil {
 		return
 	}
@@ -312,7 +331,7 @@ func (driver *Driver) buildDeploymentConfiguration() (deploymentConfiguration co
 
 		Start: true,
 	}
-	deploymentConfiguration.ApplyOSImage(image)
+	image.ApplyTo(&deploymentConfiguration)
 
 	return
 }

driver.go

@@ -153,7 +153,7 @@ func (driver *Driver) GetCreateFlags() []mcnflag.Flag {
 		},
 		mcnflag.StringFlag{
 			Name:  "ddcloud-image-name",
-			Usage: fmt.Sprintf(`The name of OS image used to create the target machine. Default: "%s"`, DefaultImageName),
+			Usage: fmt.Sprintf(`The name of the image used to create the target machine. Default: "%s"`, DefaultImageName),
 			Value: DefaultImageName,
 		},
 		mcnflag.StringFlag{