Support placement directives on bootstrap

provider/ec2/ec2.go

 // Copyright 2011, 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package ec2
 
 import (
         "fmt"
         "sync"
         "time"
 
@@ skipping 305 matching lines @@
         return e.name
 }
 
 func (e *environ) Storage() storage.Storage {
         e.ecfgMutex.Lock()
         stor := e.storageUnlocked
         e.ecfgMutex.Unlock()
         return stor
 }
 
-func (e *environ) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
-        return common.Bootstrap(ctx, e, cons)
+func (e *environ) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
+        return common.Bootstrap(ctx, e, args)
 }
 
 func (e *environ) StateInfo() (*state.Info, *api.Info, error) {
         return common.StateInfo(e)
 }
 
 // SupportedArchitectures is specified on the EnvironCapability interface.
 func (e *environ) SupportedArchitectures() ([]string, error) {
         e.archMutex.Lock()
         defer e.archMutex.Unlock()
@@ skipping 778 matching lines @@
         return sources, nil
 }
 
 // GetToolsSources returns a list of sources which are used to search for simplestreams tools metadata.
 func (e *environ) GetToolsSources() ([]simplestreams.DataSource, error) {
         // Add the simplestreams source off the control bucket.
         sources := []simplestreams.DataSource{
                 storage.NewStorageSimpleStreamsDataSource("cloud storage", e.Storage(), storage.BaseToolsPath)}
         return sources, nil
 }