Support placement directives on bootstrap

provider/dummy/environs.go

Index: provider/dummy/environs.go
=== modified file 'provider/dummy/environs.go'
--- provider/dummy/environs.go	2014-04-22 09:23:39 +0000
+++ provider/dummy/environs.go	2014-04-24 02:27:38 +0000
@@ -98,9 +98,9 @@
 type Operation interface{}
 
 type OpBootstrap struct {
-	Context     environs.BootstrapContext
-	Env         string
-	Constraints constraints.Value
+	Context environs.BootstrapContext
+	Env     string
+	Args    environs.BootstrapParams
 }
 
 type OpDestroy struct {
@@ -562,8 +562,8 @@
 		storage.NewStorageSimpleStreamsDataSource("cloud storage", e.Storage(), storage.BaseToolsPath)}, nil
 }
 
-func (e *environ) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
-	selectedTools, err := common.EnsureBootstrapTools(ctx, e, config.PreferredSeries(e.Config()), cons.Arch)
+func (e *environ) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
+	selectedTools, err := common.EnsureBootstrapTools(ctx, e, config.PreferredSeries(e.Config()), args.Constraints.Arch)
 	if err != nil {
 		return err
 	}
@@ -615,7 +615,7 @@
 		if err != nil {
 			panic(err)
 		}
-		if err := st.SetEnvironConstraints(cons); err != nil {
+		if err := st.SetEnvironConstraints(args.Constraints); err != nil {
 			panic(err)
 		}
 		if err := st.SetAdminMongoPassword(utils.UserPasswordHash(password, utils.CompatSalt)); err != nil {
@@ -632,7 +632,7 @@
 		estate.apiState = st
 	}
 	estate.bootstrapped = true
-	estate.ops <- OpBootstrap{Context: ctx, Env: e.name, Constraints: cons}
+	estate.ops <- OpBootstrap{Context: ctx, Env: e.name, Args: args}
 	return nil
 }