Add an os-disk constraint

environs/ec2/instancetype.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package ec2
 
 import (
         "launchpad.net/goamz/aws"
         "launchpad.net/juju-core/environs/instances"
 )
 
 // Type of virtualisation used.
 var (
         paravirtual = "pv"
         hvm         = "hvm"
 )
 
 // all instance types can run amd64 images, and some can also run i386 ones.
 var (
         amd64 = []string{"amd64"}
         both  = []string{"amd64", "i386"}
 )
 
 // allRegions is defined here to allow tests to override the content.
 var allRegions = aws.Regions
+
+// TODO(bug 1212688): the RootDisk defaults to 8G currently until the
+// referenced bug is fixed, at which point RootDisk can be set to nil and the
+// specified constraint can be passed through via block device mapping to
+// request an appropriate resize of the root disk.
 
 // allInstanceTypes holds the relevant attributes of every known
 // instance type.
 var allInstanceTypes = []instances.InstanceType{
         { // First generation.
                 Name:     "m1.small",
                 Arches:   both,
                 CpuCores: 1,
                 CpuPower: instances.CpuPower(100),
                 Mem:      1740,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "m1.medium",
                 Arches:   both,
                 CpuCores: 1,
                 CpuPower: instances.CpuPower(200),
                 Mem:      3840,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "m1.large",
                 Arches:   amd64,
                 CpuCores: 2,
                 CpuPower: instances.CpuPower(400),
                 Mem:      7680,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "m1.xlarge",
                 Arches:   amd64,
                 CpuCores: 4,
                 CpuPower: instances.CpuPower(800),
                 Mem:      15360,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
         { // Second generation.
                 Name:     "m3.xlarge",
                 Arches:   amd64,
                 CpuCores: 4,
                 CpuPower: instances.CpuPower(1300),
                 Mem:      15360,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "m3.2xlarge",
                 Arches:   amd64,
                 CpuCores: 8,
                 CpuPower: instances.CpuPower(2600),
                 Mem:      30720,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
         { // Micro.
                 Name:     "t1.micro",
                 Arches:   both,
                 CpuCores: 1,
                 CpuPower: instances.CpuPower(20),
                 Mem:      613,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
         { // High-Memory.
                 Name:     "m2.xlarge",
                 Arches:   amd64,
                 CpuCores: 2,
                 CpuPower: instances.CpuPower(650),
                 Mem:      17408,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "m2.2xlarge",
                 Arches:   amd64,
                 CpuCores: 4,
                 CpuPower: instances.CpuPower(1300),
                 Mem:      34816,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "m2.4xlarge",
                 Arches:   amd64,
                 CpuCores: 8,
                 CpuPower: instances.CpuPower(2600),
                 Mem:      69632,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
         { // High-CPU.
                 Name:     "c1.medium",
                 Arches:   both,
                 CpuCores: 2,
                 CpuPower: instances.CpuPower(500),
                 Mem:      1740,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         }, {
                 Name:     "c1.xlarge",
                 Arches:   amd64,
                 CpuCores: 8,
                 CpuPower: instances.CpuPower(2000),
                 Mem:      7168,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
         { // Cluster compute.
                 Name:     "cc1.4xlarge",
                 Arches:   amd64,
                 CpuCores: 8,
                 CpuPower: instances.CpuPower(3350),
                 Mem:      23552,
+                RootDisk: 8192,
                 VType:    &hvm,
         }, {
                 Name:     "cc2.8xlarge",
                 Arches:   amd64,
                 CpuCores: 16,
                 CpuPower: instances.CpuPower(8800),
                 Mem:      61952,
+                RootDisk: 8192,
                 VType:    &hvm,
         },
         { // High Memory cluster.
                 Name:     "cr1.8xlarge",
                 Arches:   amd64,
                 CpuCores: 16,
                 CpuPower: instances.CpuPower(8800),
                 Mem:      249856,
+                RootDisk: 8192,
                 VType:    &hvm,
         },
         { // Cluster GPU.
                 Name:     "cg1.4xlarge",
                 Arches:   amd64,
                 CpuCores: 8,
                 CpuPower: instances.CpuPower(3350),
                 Mem:      22528,
+                RootDisk: 8192,
                 VType:    &hvm,
         },
         { // High I/O.
                 Name:     "hi1.4xlarge",
                 Arches:   amd64,
                 CpuCores: 16,
                 CpuPower: instances.CpuPower(3500),
                 Mem:      61952,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
         { // High storage.
                 Name:     "hs1.8xlarge",
                 Arches:   amd64,
                 CpuCores: 16,
                 CpuPower: instances.CpuPower(3500),
                 Mem:      119808,
+                RootDisk: 8192,
                 VType:    &paravirtual,
         },
 }
 
 type instanceTypeCost map[string]uint64
 type regionCosts map[string]instanceTypeCost
 
 // allRegionCosts holds the cost in USDe-3/hour for each available instance
 // type in each region.
 var allRegionCosts = regionCosts{
@@ skipping 113 matching lines @@
                 "m2.xlarge":   410,
                 "m2.2xlarge":  820,
                 "m2.4xlarge":  1640,
                 "c1.medium":   145,
                 "c1.xlarge":   580,
                 "cc2.8xlarge": 2400,
                 "cr1.8xlarge": 3500,
                 "hi1.4xlarge": 3100,
         },
 }