update to add flavors and disk size

glide.yaml

@@ -5,4 +5,4 @@ import:
 - package: github.com/mitchellh/multistep
   version: 391576a156a54cfbb4cf5d5eda40cf6ffa3e3a4d
 - package: github.com/sandwichcloud/deli-cli
-  version: 0.0.10
+  version: 0.0.14

sandwich/builder.go

@@ -65,6 +65,8 @@ func (builder *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache)
 		},
 		&StepRunInstance{
 			Name:          builder.config.ImageName,
+			FlavorID:      builder.config.FlavorID,
+			Disk:          builder.config.Disk,
 			SourceImageID: builder.config.SourceImageID,
 			NetworkID:     builder.config.NetworkID,
 			UserData:      builder.config.UserData,

sandwich/run_config.go

@@ -16,6 +16,7 @@ type RunConfig struct {
 
 	SourceImageID string            `mapstructure:"source_image_id"`
 	FlavorID      string            `mapstructure:"flavor_id"`
+	Disk          int               `mapstructure:"disk"`
 	NetworkID     string            `mapstructure:"network_id"`
 	UserData      string            `mapstructure:"user_data"`
 	Tags          map[string]string `mapstructure:"tags"`
@@ -49,9 +50,9 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 		errs = append(errs, errors.New("network_id must be specified"))
 	}
 
-	//if c.FlavorID == "" {
-	//	errs = append(errs, errors.New("flavor_id must be specified"))
-	//}
+	if c.FlavorID == "" {
+		errs = append(errs, errors.New("flavor_id must be specified"))
+	}
 
 	return errs
 }

sandwich/step_run_instance.go

@@ -11,6 +11,8 @@ import (
 
 type StepRunInstance struct {
 	Name          string
+	FlavorID      string
+	Disk          int
 	SourceImageID string
 	NetworkID     string
 	UserData      string
@@ -42,7 +44,7 @@ func (s *StepRunInstance) Run(state multistep.StateBag) multistep.StepAction {
 		s.Tags = make(map[string]string)
 	}
 
-	instance, err := instanceClient.Create(s.Name, s.SourceImageID, config.RegionID, "", s.NetworkID, "", keyPairIDs, s.Tags)
+	instance, err := instanceClient.Create(s.Name, s.SourceImageID, config.RegionID, "", s.NetworkID, "", s.FlavorID, s.Disk, keyPairIDs, s.Tags)
 	if err != nil {
 		err := fmt.Errorf("Error creating source instance: %s", err)
 		state.Put("error", err)