Add an os-disk constraint

environs/openstack/image.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package openstack
 
 import (
         "launchpad.net/juju-core/environs/imagemetadata"
         "launchpad.net/juju-core/environs/instances"
 )
 
 // findInstanceSpec returns an image and instance type satisfying the constraint.
 // The instance type comes from querying the flavors supported by the deployment.
 func findInstanceSpec(e *environ, ic *instances.InstanceConstraint) (*instances.InstanceSpec, error) {
         // first construct all available instance types from the supported flavors.
         nova := e.nova()
         flavors, err := nova.ListFlavorsDetail()
         if err != nil {
                 return nil, err
         }
         allInstanceTypes := []instances.InstanceType{}
         for _, flavor := range flavors {
                 instanceType := instances.InstanceType{
                         Id:       flavor.Id,
                         Name:     flavor.Name,
                         Arches:   ic.Arches,
                         Mem:      uint64(flavor.RAM),
                         CpuCores: uint64(flavor.VCPUs),
+                        OsDisk:   uint64(flavor.Disk * 1024),

[gz, 2013/08/14 17:15:09]

0 is a valid special case, which does not mean there's no root partition.
However, this logic should be fine I think, if a disk constraint is listed not
selecting one of those flavors should be correct.

[sidnei.da.silva, 2013/08/14 17:58:14]

Done.

                 }
                 allInstanceTypes = append(allInstanceTypes, instanceType)
         }
 
         imageConstraint := imagemetadata.ImageConstraint{
                 CloudSpec: imagemetadata.CloudSpec{ic.Region, e.ecfg().authURL()},
                 Series:    ic.Series,
                 Arches:    ic.Arches,
         }
         baseURLs, err := e.getImageBaseURLs()
         if err != nil {
                 return nil, err
         }
         // TODO (wallyworld): use an env parameter (default true) to mandate use of only signed image metadata.
         matchingImages, err := imagemetadata.Fetch(baseURLs, imagemetadata.DefaultIndexPath, &imageConstraint, false)
         if err != nil {
                 return nil, err
         }
         images := instances.ImageMetadataToImages(matchingImages)
         spec, err := instances.FindInstanceSpec(images, ic, allInstanceTypes)
         if err != nil {
                 return nil, err
         }
         return spec, nil
 }