Merge lp:~axwalk/juju-core/lp1237709-bootstrap-placement into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Support placement directives on bootstrap

juju bootstrap will accept a single, optional
positional argument that will be parsed as a
placement directive. We currently only allow
unscoped placement directives at bootstrap.

https://codereview.appspot.com/91740043/

Support placement directives on bootstrap

juju bootstrap will accept a single, optional
positional argument that will be parsed as a
placement directive. We currently only allow
unscoped placement directives at bootstrap.

https://codereview.appspot.com/91740043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+216971_code.launchpad.net,

Message:
Please take a look.

Description:
Support placement directives on bootstrap

juju bootstrap will accept a single, optional
positional argument that will be parsed as a
placement directive. We currently only allow
unscoped placement directives at bootstrap.

https://code.launchpad.net/~axwalk/juju-core/lp1237709-bootstrap-placement/+merge/216971

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/91740043/

Affected files (+156, -108 lines):
   A [revision details]
   M cmd/juju/bootstrap.go
   M cmd/juju/bootstrap_test.go
   M cmd/juju/cmd_test.go
   M cmd/juju/deploy_test.go
   M cmd/plugins/juju-restore/restore.go
   M environs/bootstrap/bootstrap.go
   M environs/bootstrap/bootstrap_test.go
   M environs/interface.go
   M environs/jujutest/livetests.go
   M environs/jujutest/tests.go
   M environs/open_test.go
   M juju/apiconn_test.go
   M juju/conn_test.go
   M juju/testing/conn.go
   M provider/azure/environ.go
   M provider/common/bootstrap.go
   M provider/common/bootstrap_test.go
   M provider/common/mock_test.go
   M provider/dummy/environs.go
   M provider/ec2/ec2.go
   M provider/ec2/local_test.go
   M provider/joyent/environ.go
   M provider/joyent/local_test.go
   M provider/local/config_test.go
   M provider/local/environ.go
   M provider/local/environ_test.go
   M provider/maas/environ.go
   M provider/maas/environ_whitebox_test.go
   M provider/manual/environ.go
   M provider/openstack/live_test.go
   M provider/openstack/local_test.go
   M provider/openstack/provider.go

[Ian Booth (wallyworld)]

LGTM with a suggestion.
Also a drive by fix for
// Directive is a scope-specific placement idrective

would be great.

https://codereview.appspot.com/91740043/diff/1/cmd/juju/bootstrap.go
File cmd/juju/bootstrap.go (right):

https://codereview.appspot.com/91740043/diff/1/cmd/juju/bootstrap.go#newcode107
cmd/juju/bootstrap.go:107: if err != instance.ErrPlacementScopeMissing {
What happens if there's a different error other than
ErrPlacementScopeMissing?
In that case we should just return that other error shouldn't we? ie
there's a difference between an unsupported placement directive and a
placement directive that doesn't parse due to some other error. Even if
there's no other error that can be returned (yet), reworking the
conditional would make it explicit that we are only interested in a
specific case.

https://codereview.appspot.com/91740043/

[Andrew Wilkins (axwalk)]

Please take a look.

https://codereview.appspot.com/91740043/diff/1/cmd/juju/bootstrap.go
File cmd/juju/bootstrap.go (right):

https://codereview.appspot.com/91740043/diff/1/cmd/juju/bootstrap.go#newcode107
cmd/juju/bootstrap.go:107: if err != instance.ErrPlacementScopeMissing {
On 2014/04/24 03:10:01, wallyworld wrote:
> What happens if there's a different error other than
ErrPlacementScopeMissing?
> In that case we should just return that other error shouldn't we? ie
there's a
> difference between an unsupported placement directive and a placement
directive
> that doesn't parse due to some other error. Even if there's no other
error that
> can be returned (yet), reworking the conditional would make it
explicit that we
> are only interested in a specific case.

There are other errors, but they're not meaningful to us if we don't
support scoped placements. For example, lxc:non-numeric will fail to
parse, but we bootstrap doesn't care about why; it only cares that
"lxc:anything" is not supported by bootstrap.

https://codereview.appspot.com/91740043/

[Go Bot (go-bot)]

The attempt to merge lp:~axwalk/juju-core/lp1237709-bootstrap-placement into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.907s
ok launchpad.net/juju-core/agent/mongo 1.310s
ok launchpad.net/juju-core/agent/tools 0.173s
ok launchpad.net/juju-core/bzr 5.220s
ok launchpad.net/juju-core/cert 2.368s
ok launchpad.net/juju-core/charm 0.366s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.029s
ok launchpad.net/juju-core/cloudinit/sshinit 0.805s
ok launchpad.net/juju-core/cmd 0.178s
ok launchpad.net/juju-core/cmd/charm-admin 0.707s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.216s
ok launchpad.net/juju-core/cmd/juju 226.670s
ok launchpad.net/juju-core/cmd/jujud 77.888s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 10.731s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.199s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container 0.045s
ok launchpad.net/juju-core/container/factory 0.049s
ok launchpad.net/juju-core/container/kvm 0.195s
ok launchpad.net/juju-core/container/kvm/mock 0.034s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 3.221s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.243s
ok launchpad.net/juju-core/environs 2.623s
ok launchpad.net/juju-core/environs/bootstrap 11.317s
ok launchpad.net/juju-core/environs/cloudinit 0.415s
ok launchpad.net/juju-core/environs/config 1.846s
ok launchpad.net/juju-core/environs/configstore 0.030s
ok launchpad.net/juju-core/environs/filestorage 0.026s
ok launchpad.net/juju-core/environs/httpstorage 0.771s
ok launchpad.net/juju-core/environs/imagemetadata 0.413s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.043s
ok launchpad.net/juju-core/environs/jujutest 0.165s
ok launchpad.net/juju-core/environs/manual 12.387s
? launchpad.net/juju-core/environs/network [no test files]
ok launchpad.net/juju-core/environs/simplestreams 0.274s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.876s
ok launchpad.net/juju-core/environs/storage 1.011s
ok launchpad.net/juju-core/environs/sync 50.343s
ok launchpad.net/juju-core/environs/testing 0.143s
ok launchpad.net/juju-core/environs/tools 4.910s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.017s
ok launchpad.net/juju-core/instance 0.017s
? launchpad.net/juju-core/ins...

=== modified file 'cmd/juju/bootstrap.go'
--- cmd/juju/bootstrap.go	2014-04-18 13:49:33 +0000
+++ cmd/juju/bootstrap.go	2014-04-24 03:34:13 +0000
@@ -14,9 +14,11 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/tools"
+	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider"
 )
 
@@ -64,11 +66,13 @@
 	UploadTools    bool
 	Series         []string
 	MetadataSource string
+	Placement      string
 }
 
 func (c *BootstrapCommand) Info() *cmd.Info {
 	return &cmd.Info{
 		Name:    "bootstrap",
+		Args:    "[placement]",
 		Purpose: "start up an environment from scratch",
 		Doc:     bootstrapDoc,
 	}
@@ -90,7 +94,22 @@
 	if len(c.Series) > 0 && !c.UploadTools {
 		return fmt.Errorf("--series requires --upload-tools")
 	}
-	return cmd.CheckEmpty(args)
+	// Parse the placement directive. Bootstrap currently only
+	// supports provider-specific placement directives.
+	placement, err := cmd.ZeroOrOneArgs(args)
+	if err != nil {
+		return err
+	}
+	if placement == "" {
+		return nil
+	}
+	_, err = instance.ParsePlacement(placement)
+	if err != instance.ErrPlacementScopeMissing {
+		// We only support unscoped placement directives for bootstrap.
+		return fmt.Errorf("unsupported bootstrap placement directive %q", placement)
+	}
+	c.Placement = placement
+	return nil
 }
 
 // Run connects to the environment specified on the command line and bootstraps
@@ -153,7 +172,10 @@
 			return err
 		}
 	}
-	return bootstrap.Bootstrap(ctx, environ, c.Constraints)
+	return bootstrap.Bootstrap(ctx, environ, environs.BootstrapParams{
+		Constraints: c.Constraints,
+		Placement:   c.Placement,
+	})
 }
 
 type seriesVar struct {
 
=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2014-04-21 23:10:05 +0000
+++ cmd/juju/bootstrap_test.go	2014-04-24 03:34:13 +0000
@@ -193,6 +193,7 @@
 	// will be uploaded before running the test.
 	uploads     []string
 	constraints constraints.Value
+	placement   string
 	hostArch    string
 }
 
@@ -271,7 +272,8 @@
 
 	opBootstrap := (<-opc).(dummy.OpBootstrap)
 	c.Check(opBootstrap.Env, gc.Equals, "peckham")
-	c.Check(opBootstrap.Constraints, gc.DeepEquals, test.constraints)
+	c.Check(opBootstrap.Args.Constraints, gc.DeepEquals, test.constraints)
+	c.Check(opBootstrap.Args.Placement, gc.Equals, test.placement)
 
 	store, err := configstore.Default()
 	c.Assert(err, gc.IsNil)
@@ -287,10 +289,6 @@
 var bootstrapTests = []bootstrapTest{{
 	info: "no args, no error, no uploads, no constraints",
 }, {
-	info: "bad arg",
-	args: []string{"twiddle"},
-	err:  `unrecognized args: \["twiddle"\]`,
-}, {
 	info: "bad --constraints",
 	args: []string{"--constraints", "bad=wrong"},
 	err:  `invalid value "bad=wrong" for flag --constraints: unknown constraint "bad"`,
@@ -372,6 +370,14 @@
 		"1.2.3.5-raring-amd64",
 		"1.2.3.5-%LTS%-amd64",
 	},
+}, {
+	info:      "placement",
+	args:      []string{"something"},
+	placement: "something",
+}, {
+	info: "invalid placement: ssh",
+	args: []string{"ssh:someplace"},
+	err:  `unsupported bootstrap placement directive "ssh:someplace"`,
 }}
 
 func (s *BootstrapSuite) TestBootstrapTwice(c *gc.C) {
 
=== modified file 'cmd/juju/cmd_test.go'
--- cmd/juju/cmd_test.go	2014-03-28 12:28:30 +0000
+++ cmd/juju/cmd_test.go	2014-04-24 03:34:13 +0000
@@ -114,11 +114,6 @@
 		testInit(c, com, args, "")
 		os.Setenv(osenv.JujuEnvEnvKey, oldenv)
 		assertConnName(c, com, "walthamstow")
-
-		com, args = cmdFunc()
-		if _, ok := com.(*StatusCommand); !ok {
-			testInit(c, com, append(args, "hotdog"), "unrecognized args.*")
-		}
 	}
 }
 
 
=== modified file 'cmd/juju/deploy_test.go'
--- cmd/juju/deploy_test.go	2014-04-14 12:36:13 +0000
+++ cmd/juju/deploy_test.go	2014-04-24 03:34:13 +0000
@@ -37,6 +37,9 @@
 		args: nil,
 		err:  `no charm specified`,
 	}, {
+		args: []string{"charm-name", "service-name", "hotdog"},
+		err:  `unrecognized args: \["hotdog"\]`,
+	}, {
 		args: []string{"craz~ness"},
 		err:  `invalid charm name "craz~ness"`,
 	}, {
 
=== modified file 'cmd/plugins/juju-restore/restore.go'
--- cmd/plugins/juju-restore/restore.go	2014-04-12 05:53:58 +0000
+++ cmd/plugins/juju-restore/restore.go	2014-04-24 03:34:13 +0000
@@ -254,7 +254,8 @@
 	// error-prone) or we could provide a --no-check flag to make
 	// it go ahead anyway without the check.
 
-	if err := bootstrap.Bootstrap(ctx, env, cons); err != nil {
+	args := environs.BootstrapParams{Constraints: cons}
+	if err := bootstrap.Bootstrap(ctx, env, args); err != nil {
 		return nil, fmt.Errorf("cannot bootstrap new instance: %v", err)
 	}
 	return env, nil
 
=== modified file 'environs/bootstrap/bootstrap.go'
--- environs/bootstrap/bootstrap.go	2014-04-17 10:09:39 +0000
+++ environs/bootstrap/bootstrap.go	2014-04-24 03:34:13 +0000
@@ -8,7 +8,6 @@
 
 	"github.com/juju/loggo"
 
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils/ssh"
@@ -20,7 +19,7 @@
 // Bootstrap bootstraps the given environment. The supplied constraints are
 // used to provision the instance, and are also set within the bootstrapped
 // environment.
-func Bootstrap(ctx environs.BootstrapContext, environ environs.Environ, cons constraints.Value) error {
+func Bootstrap(ctx environs.BootstrapContext, environ environs.Environ, args environs.BootstrapParams) error {
 	cfg := environ.Config()
 	if secret := cfg.AdminSecret(); secret == "" {
 		return fmt.Errorf("environment configuration has no admin-secret")
@@ -45,7 +44,7 @@
 	}
 	logger.Debugf("environment %q supports service/machine networks: %v", environ.Name(), environ.SupportNetworks())
 	logger.Infof("bootstrapping environment %q", environ.Name())
-	return environ.Bootstrap(ctx, cons)
+	return environ.Bootstrap(ctx, args)
 }
 
 // SetBootstrapTools returns the newest tools from the given tools list,
 
=== modified file 'environs/bootstrap/bootstrap_test.go'
--- environs/bootstrap/bootstrap_test.go	2014-04-17 09:42:34 +0000
+++ environs/bootstrap/bootstrap_test.go	2014-04-24 03:34:13 +0000
@@ -70,20 +70,20 @@
 		env.cfg = cfg
 	}
 
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "environment configuration has no admin-secret")
 
 	fixEnv("admin-secret", "whatever")
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "environment configuration has no ca-cert")
 
 	fixEnv("ca-cert", coretesting.CACert)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "environment configuration has no ca-private-key")
 
 	fixEnv("ca-private-key", coretesting.CAKey)
 	uploadTools(c, env)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 }
 
@@ -96,20 +96,30 @@
 func (s *bootstrapSuite) TestBootstrapEmptyConstraints(c *gc.C) {
 	env := newEnviron("foo", useDefaultKeys, nil)
 	s.setDummyStorage(c, env)
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	c.Assert(env.bootstrapCount, gc.Equals, 1)
-	c.Assert(env.constraints, gc.DeepEquals, constraints.Value{})
+	c.Assert(env.args, gc.DeepEquals, environs.BootstrapParams{})
 }
 
 func (s *bootstrapSuite) TestBootstrapSpecifiedConstraints(c *gc.C) {
 	env := newEnviron("foo", useDefaultKeys, nil)
 	s.setDummyStorage(c, env)
 	cons := constraints.MustParse("cpu-cores=2 mem=4G")
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, cons)
-	c.Assert(err, gc.IsNil)
-	c.Assert(env.bootstrapCount, gc.Equals, 1)
-	c.Assert(env.constraints, gc.DeepEquals, cons)
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{Constraints: cons})
+	c.Assert(err, gc.IsNil)
+	c.Assert(env.bootstrapCount, gc.Equals, 1)
+	c.Assert(env.args.Constraints, gc.DeepEquals, cons)
+}
+
+func (s *bootstrapSuite) TestBootstrapSpecifiedPlacement(c *gc.C) {
+	env := newEnviron("foo", useDefaultKeys, nil)
+	s.setDummyStorage(c, env)
+	placement := "directive"
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{Placement: placement})
+	c.Assert(err, gc.IsNil)
+	c.Assert(env.bootstrapCount, gc.Equals, 1)
+	c.Assert(env.args.Placement, gc.DeepEquals, placement)
 }
 
 var bootstrapSetAgentVersionTests = []envtesting.BootstrapToolsTest{
@@ -179,7 +189,7 @@
 		if test.Arch != "" {
 			cons = constraints.MustParse("arch=" + test.Arch)
 		}
-		err = bootstrap.Bootstrap(coretesting.Context(c), env, cons)
+		err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{Constraints: cons})
 		if test.Err != "" {
 			c.Check(err, gc.NotNil)
 			if err != nil {
@@ -206,7 +216,7 @@
 	env := newEnviron("foo", useDefaultKeys, nil)
 	s.setDummyStorage(c, env)
 	envtesting.RemoveFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	// bootstrap.Bootstrap leaves it to the provider to
 	// locate bootstrap tools.
 	c.Assert(err, gc.IsNil)
@@ -479,7 +489,7 @@
 
 	// The following fields are filled in when Bootstrap is called.
 	bootstrapCount int
-	constraints    constraints.Value
+	args           environs.BootstrapParams
 	storage        storage.Storage
 }
 
@@ -525,9 +535,9 @@
 	return e.name
 }
 
-func (e *bootstrapEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
+func (e *bootstrapEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
 	e.bootstrapCount++
-	e.constraints = cons
+	e.args = args
 	return nil
 }
 
 
=== modified file 'environs/interface.go'
--- environs/interface.go	2014-04-22 09:23:39 +0000
+++ environs/interface.go	2014-04-24 03:34:13 +0000
@@ -65,6 +65,17 @@
 	Config() *config.Config
 }
 
+// BootstrapParams holds the parameters for bootstrapping an environment.
+type BootstrapParams struct {
+	// Constraints are used to choose the initial instance specification,
+	// and will be stored in the new environment's state.
+	Constraints constraints.Value
+
+	// Placement, if non-empty, holds an environment-specific placement
+	// directive used to choose the initial instance.
+	Placement string
+}
+
 // An Environ represents a juju environment as specified
 // in the environments.yaml file.
 //
@@ -91,13 +102,10 @@
 	// environment via the juju package, the password hash will be
 	// automatically replaced by the real password.
 	//
-	// The supplied constraints are used to choose the initial instance
-	// specification, and will be stored in the new environment's state.
-	//
 	// Bootstrap is responsible for selecting the appropriate tools,
 	// and setting the agent-version configuration attribute prior to
 	// bootstrapping the environment.
-	Bootstrap(ctx BootstrapContext, cons constraints.Value) error
+	Bootstrap(ctx BootstrapContext, params BootstrapParams) error
 
 	// StateInfo returns information on the state initialized
 	// by Bootstrap.
 
=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2014-04-22 09:23:39 +0000
+++ environs/jujutest/livetests.go	2014-04-24 03:34:13 +0000
@@ -139,7 +139,7 @@
 	envtesting.UploadFakeTools(c, t.Env.Storage())
 	err := bootstrap.EnsureNotBootstrapped(t.Env)
 	c.Assert(err, gc.IsNil)
-	err = bootstrap.Bootstrap(coretesting.Context(c), t.Env, cons)
+	err = bootstrap.Bootstrap(coretesting.Context(c), t.Env, environs.BootstrapParams{Constraints: cons})
 	c.Assert(err, gc.IsNil)
 	t.bootstrapped = true
 }
@@ -917,7 +917,7 @@
 	err = storageCopy(dummyStorage, currentName, envStorage, otherName)
 	c.Assert(err, gc.IsNil)
 
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	conn, err := juju.NewConn(env)
 
=== modified file 'environs/jujutest/tests.go'
--- environs/jujutest/tests.go	2014-04-14 12:36:13 +0000
+++ environs/jujutest/tests.go	2014-04-24 03:34:13 +0000
@@ -12,7 +12,6 @@
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
@@ -133,7 +132,7 @@
 	envtesting.UploadFakeTools(c, e.Storage())
 	err := bootstrap.EnsureNotBootstrapped(e)
 	c.Assert(err, gc.IsNil)
-	err = bootstrap.Bootstrap(coretesting.Context(c), e, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), e, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	info, apiInfo, err := e.StateInfo()
@@ -161,7 +160,7 @@
 
 	err = bootstrap.EnsureNotBootstrapped(e3)
 	c.Assert(err, gc.IsNil)
-	err = bootstrap.Bootstrap(coretesting.Context(c), e3, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), e3, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	err = bootstrap.EnsureNotBootstrapped(e3)
 
=== modified file 'environs/open_test.go'
--- environs/open_test.go	2014-04-14 12:36:13 +0000
+++ environs/open_test.go	2014-04-24 03:34:13 +0000
@@ -10,7 +10,6 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/cert"
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
@@ -41,7 +40,7 @@
 	env, err := environs.Prepare(cfg, ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 }
 
 
=== modified file 'instance/placement.go'
--- instance/placement.go	2014-04-23 05:38:27 +0000
+++ instance/placement.go	2014-04-24 03:34:13 +0000
@@ -28,7 +28,7 @@
 	// If Scope is empty, then it must be inferred from the context.
 	Scope string
 
-	// Directive is a scope-specific placement idrective.
+	// Directive is a scope-specific placement directive.
 	//
 	// For MachineScope or a container scope, this may be empty or
 	// the ID of an existing machine.
 
=== modified file 'juju/apiconn_test.go'
--- juju/apiconn_test.go	2014-04-22 14:34:29 +0000
+++ juju/apiconn_test.go	2014-04-24 03:34:13 +0000
@@ -11,7 +11,6 @@
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
@@ -53,7 +52,7 @@
 	c.Assert(err, gc.IsNil)
 
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	cfg = env.Config()
@@ -601,7 +600,7 @@
 	c.Assert(err, gc.IsNil)
 	defer dummy.Reset()
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// Note: if we get Bootstrap to start caching the API endpoint
 
=== modified file 'juju/conn_test.go'
--- juju/conn_test.go	2014-04-14 12:36:13 +0000
+++ juju/conn_test.go	2014-04-24 03:34:13 +0000
@@ -70,7 +70,7 @@
 	env, err := environs.Prepare(cfg, ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	attrs := env.Config().AllAttrs()
@@ -90,7 +90,7 @@
 	env, err := environs.PrepareFromName(envName, ctx, store)
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 }
 
@@ -136,7 +136,7 @@
 	env, err := environs.Prepare(cfg, ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	info, _, err := env.StateInfo()
 	c.Assert(err, gc.IsNil)
@@ -180,7 +180,7 @@
 	env, err := environs.Prepare(cfg, ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// Make a new Conn, which will push the secrets.
@@ -217,7 +217,7 @@
 	env, err := environs.Prepare(cfg, ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err = bootstrap.Bootstrap(ctx, env, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// Check that Bootstrap has correctly used a hash
@@ -272,7 +272,7 @@
 	environ, err := environs.Prepare(cfg, ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, environ.Storage())
-	err = bootstrap.Bootstrap(ctx, environ, constraints.Value{})
+	err = bootstrap.Bootstrap(ctx, environ, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	s.conn, err = juju.NewConn(environ)
 	c.Assert(err, gc.IsNil)
 
=== modified file 'juju/testing/conn.go'
--- juju/testing/conn.go	2014-04-11 17:51:58 +0000
+++ juju/testing/conn.go	2014-04-24 03:34:13 +0000
@@ -14,7 +14,6 @@
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
@@ -220,7 +219,7 @@
 
 	// Upload tools for both preferred and fake default series
 	envtesting.MustUploadFakeToolsVersions(environ.Storage(), versions...)
-	c.Assert(bootstrap.Bootstrap(ctx, environ, constraints.Value{}), gc.IsNil)
+	c.Assert(bootstrap.Bootstrap(ctx, environ, environs.BootstrapParams{}), gc.IsNil)
 
 	s.BackingState = environ.(GetStater).GetStateInAPIServer()
 
 
=== modified file 'provider/azure/environ.go'
--- provider/azure/environ.go	2014-04-22 09:38:55 +0000
+++ provider/azure/environ.go	2014-04-24 03:34:13 +0000
@@ -260,7 +260,7 @@
 }
 
 // Bootstrap is specified in the Environ interface.
-func (env *azureEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) (err error) {
+func (env *azureEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) (err error) {
 	// The creation of the affinity group and the virtual network is specific to the Azure provider.
 	err = env.createAffinityGroup()
 	if err != nil {
@@ -282,7 +282,7 @@
 			env.deleteVirtualNetwork()
 		}
 	}()
-	err = common.Bootstrap(ctx, env, cons)
+	err = common.Bootstrap(ctx, env, args)
 	return err
 }
 
 
=== modified file 'provider/common/bootstrap.go'
--- provider/common/bootstrap.go	2014-04-11 11:51:08 +0000
+++ provider/common/bootstrap.go	2014-04-24 03:34:13 +0000
@@ -15,7 +15,6 @@
 
 	coreCloudinit "launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/cloudinit/sshinit"
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/cloudinit"
@@ -33,7 +32,7 @@
 // Bootstrap is a common implementation of the Bootstrap method defined on
 // environs.Environ; we strongly recommend that this implementation be used
 // when writing a new provider.
-func Bootstrap(ctx environs.BootstrapContext, env environs.Environ, cons constraints.Value) (err error) {
+func Bootstrap(ctx environs.BootstrapContext, env environs.Environ, args environs.BootstrapParams) (err error) {
 	// TODO make safe in the case of racing Bootstraps
 	// If two Bootstraps are called concurrently, there's
 	// no way to make sure that only one succeeds.
@@ -42,7 +41,7 @@
 	defer func() { handleBootstrapError(err, ctx, inst, env) }()
 
 	// First thing, ensure we have tools otherwise there's no point.
-	selectedTools, err := EnsureBootstrapTools(ctx, env, config.PreferredSeries(env.Config()), cons.Arch)
+	selectedTools, err := EnsureBootstrapTools(ctx, env, config.PreferredSeries(env.Config()), args.Constraints.Arch)
 	if err != nil {
 		return err
 	}
@@ -64,9 +63,10 @@
 
 	fmt.Fprintln(ctx.GetStderr(), "Launching instance")
 	inst, hw, _, err := env.StartInstance(environs.StartInstanceParams{
-		Constraints:   cons,
+		Constraints:   args.Constraints,
 		Tools:         selectedTools,
 		MachineConfig: machineConfig,
+		Placement:     args.Placement,
 	})
 	if err != nil {
 		return fmt.Errorf("cannot start bootstrap instance: %v", err)
 
=== modified file 'provider/common/bootstrap_test.go'
--- provider/common/bootstrap_test.go	2014-04-18 16:37:28 +0000
+++ provider/common/bootstrap_test.go	2014-04-24 03:34:13 +0000
@@ -76,13 +76,15 @@
 }
 
 func (s *BootstrapSuite) TestCannotStartInstance(c *gc.C) {
+	checkPlacement := "directive"
 	checkCons := constraints.MustParse("mem=8G")
 
 	startInstance := func(
-		cons constraints.Value, _, _ []string, possibleTools tools.List, mcfg *cloudinit.MachineConfig,
+		placement string, cons constraints.Value, _, _ []string, possibleTools tools.List, mcfg *cloudinit.MachineConfig,
 	) (
 		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
+		c.Assert(placement, gc.DeepEquals, checkPlacement)
 		c.Assert(cons, gc.DeepEquals, checkCons)
 		c.Assert(mcfg, gc.DeepEquals, environs.NewBootstrapMachineConfig(mcfg.SystemPrivateSSHKey))
 		return nil, nil, nil, fmt.Errorf("meh, not started")
@@ -95,7 +97,10 @@
 	}
 
 	ctx := coretesting.Context(c)
-	err := common.Bootstrap(ctx, env, checkCons)
+	err := common.Bootstrap(ctx, env, environs.BootstrapParams{
+		Constraints: checkCons,
+		Placement:   checkPlacement,
+	})
 	c.Assert(err, gc.ErrorMatches, "cannot start bootstrap instance: meh, not started")
 }
 
@@ -104,7 +109,7 @@
 	stor := &mockStorage{Storage: innerStorage}
 
 	startInstance := func(
-		_ constraints.Value, _, _ []string, _ tools.List, _ *cloudinit.MachineConfig,
+		_ string, _ constraints.Value, _, _ []string, _ tools.List, _ *cloudinit.MachineConfig,
 	) (
 		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
@@ -126,7 +131,7 @@
 	}
 
 	ctx := coretesting.Context(c)
-	err := common.Bootstrap(ctx, env, constraints.Value{})
+	err := common.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "cannot save state: suddenly a wild blah")
 	c.Assert(stopped, gc.HasLen, 1)
 	c.Assert(stopped[0].Id(), gc.Equals, instance.Id("i-blah"))
@@ -137,7 +142,7 @@
 	stor := &mockStorage{Storage: innerStorage}
 
 	startInstance := func(
-		_ constraints.Value, _, _ []string, _ tools.List, _ *cloudinit.MachineConfig,
+		_ string, _ constraints.Value, _, _ []string, _ tools.List, _ *cloudinit.MachineConfig,
 	) (
 		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
@@ -163,7 +168,7 @@
 	}
 
 	ctx := coretesting.Context(c)
-	err := common.Bootstrap(ctx, env, constraints.Value{})
+	err := common.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "cannot save state: suddenly a wild blah")
 	c.Assert(stopped, gc.HasLen, 1)
 	c.Assert(stopped[0].Id(), gc.Equals, instance.Id("i-blah"))
@@ -178,7 +183,7 @@
 	checkHardware := instance.MustParseHardware("mem=2T")
 
 	startInstance := func(
-		_ constraints.Value, _, _ []string, _ tools.List, mcfg *cloudinit.MachineConfig,
+		_ string, _ constraints.Value, _, _ []string, _ tools.List, mcfg *cloudinit.MachineConfig,
 	) (
 		instance.Instance, *instance.HardwareCharacteristics, []network.Info, error,
 	) {
@@ -206,7 +211,7 @@
 	}
 	originalAuthKeys := env.Config().AuthorizedKeys()
 	ctx := coretesting.Context(c)
-	err := common.Bootstrap(ctx, env, constraints.Value{})
+	err := common.Bootstrap(ctx, env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	authKeys := env.Config().AuthorizedKeys()
 
=== modified file 'provider/common/mock_test.go'
--- provider/common/mock_test.go	2014-04-18 16:37:28 +0000
+++ provider/common/mock_test.go	2014-04-24 03:34:13 +0000
@@ -18,7 +18,7 @@
 )
 
 type allInstancesFunc func() ([]instance.Instance, error)
-type startInstanceFunc func(constraints.Value, []string, []string, tools.List, *cloudinit.MachineConfig) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error)
+type startInstanceFunc func(string, constraints.Value, []string, []string, tools.List, *cloudinit.MachineConfig) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error)
 type stopInstancesFunc func([]instance.Instance) error
 type getToolsSourcesFunc func() ([]simplestreams.DataSource, error)
 type configFunc func() *config.Config
@@ -52,6 +52,7 @@
 }
 func (env *mockEnviron) StartInstance(args environs.StartInstanceParams) (instance.Instance, *instance.HardwareCharacteristics, []network.Info, error) {
 	return env.startInstance(
+		args.Placement,
 		args.Constraints,
 		args.MachineConfig.IncludeNetworks,
 		args.MachineConfig.ExcludeNetworks,
 
=== modified file 'provider/dummy/environs.go'
--- provider/dummy/environs.go	2014-04-22 09:23:39 +0000
+++ provider/dummy/environs.go	2014-04-24 03:34:13 +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
 }
 
 
=== modified file 'provider/ec2/ec2.go'
--- provider/ec2/ec2.go	2014-04-22 09:23:39 +0000
+++ provider/ec2/ec2.go	2014-04-24 03:34:13 +0000
@@ -323,8 +323,8 @@
 	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) {
 
=== modified file 'provider/ec2/local_test.go'
--- provider/ec2/local_test.go	2014-04-22 09:23:39 +0000
+++ provider/ec2/local_test.go	2014-04-24 03:34:13 +0000
@@ -218,7 +218,7 @@
 func (t *localServerSuite) TestBootstrapInstanceUserDataAndState(c *gc.C) {
 	env := t.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// check that the state holds the id of the bootstrap machine.
@@ -303,7 +303,7 @@
 func (t *localServerSuite) TestInstanceStatus(c *gc.C) {
 	env := t.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	t.srv.ec2srv.SetInitialInstanceState(ec2test.Terminated)
 	inst, _ := testing.AssertStartInstance(c, env, "1")
@@ -314,7 +314,7 @@
 func (t *localServerSuite) TestStartInstanceHardwareCharacteristics(c *gc.C) {
 	env := t.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	_, hc := testing.AssertStartInstance(c, env, "1")
 	c.Check(*hc.Arch, gc.Equals, "amd64")
@@ -326,7 +326,7 @@
 func (t *localServerSuite) TestAddresses(c *gc.C) {
 	env := t.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	inst, _ := testing.AssertStartInstance(c, env, "1")
 	c.Assert(err, gc.IsNil)
 
=== modified file 'provider/joyent/environ.go'
--- provider/joyent/environ.go	2014-04-22 09:38:55 +0000
+++ provider/joyent/environ.go	2014-04-24 03:34:13 +0000
@@ -154,8 +154,8 @@
 	return environs.EmptyStorage
 }
 
-func (env *joyentEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
-	return common.Bootstrap(ctx, env, cons)
+func (env *joyentEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
+	return common.Bootstrap(ctx, env, args)
 }
 
 func (env *joyentEnviron) StateInfo() (*state.Info, *api.Info, error) {
 
=== modified file 'provider/joyent/local_test.go'
--- provider/joyent/local_test.go	2014-04-18 13:49:33 +0000
+++ provider/joyent/local_test.go	2014-04-24 03:34:13 +0000
@@ -190,7 +190,7 @@
 func (s *localServerSuite) TestStartInstance(c *gc.C) {
 	env := s.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(bootstrapContext(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(bootstrapContext(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	inst, _ := testing.AssertStartInstance(c, env, "100")
 	err = env.StopInstances([]instance.Instance{inst})
@@ -200,7 +200,7 @@
 func (s *localServerSuite) TestStartInstanceHardwareCharacteristics(c *gc.C) {
 	env := s.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(bootstrapContext(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(bootstrapContext(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	_, hc := testing.AssertStartInstanceWithConstraints(c, env, "100", constraints.MustParse("mem=1024"))
 	c.Check(*hc.Arch, gc.Equals, "amd64")
@@ -310,7 +310,7 @@
 func (s *localServerSuite) TestBootstrapInstanceUserDataAndState(c *gc.C) {
 	env := s.Prepare(c)
 	envtesting.UploadFakeTools(c, env.Storage())
-	err := bootstrap.Bootstrap(bootstrapContext(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(bootstrapContext(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// check that the state holds the id of the bootstrap machine.
 
=== modified file 'provider/local/config_test.go'
--- provider/local/config_test.go	2014-03-25 02:18:04 +0000
+++ provider/local/config_test.go	2014-04-24 03:34:13 +0000
@@ -8,7 +8,7 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/provider"
@@ -109,6 +109,6 @@
 	s.PatchValue(local.CheckIfRoot, func() bool { return true })
 	env, err := local.Provider.Prepare(testing.Context(c), minimalConfig(c))
 	c.Assert(err, gc.IsNil)
-	err = env.Bootstrap(testing.Context(c), constraints.Value{})
+	err = env.Bootstrap(testing.Context(c), environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "bootstrapping a local environment must not be done as root")
 }
 
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2014-04-22 09:23:39 +0000
+++ provider/local/environ.go	2014-04-24 03:34:13 +0000
@@ -111,7 +111,7 @@
 }
 
 // Bootstrap is specified in the Environ interface.
-func (env *localEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
+func (env *localEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
 	if err := ensureNotRoot(); err != nil {
 		return err
 	}
@@ -161,7 +161,7 @@
 		agent.StorageDir:  env.config.storageDir(),
 		agent.StorageAddr: env.config.storageAddr(),
 	}
-	if err := environs.FinishMachineConfig(mcfg, cfg, cons); err != nil {
+	if err := environs.FinishMachineConfig(mcfg, cfg, args.Constraints); err != nil {
 		return err
 	}
 	// don't write proxy settings for local machine
 
=== modified file 'provider/local/environ_test.go'
--- provider/local/environ_test.go	2014-04-21 23:10:05 +0000
+++ provider/local/environ_test.go	2014-04-24 03:34:13 +0000
@@ -169,7 +169,7 @@
 	c.Assert(err, gc.IsNil)
 	envtesting.UploadFakeTools(c, environ.Storage())
 	defer environ.Storage().RemoveAll()
-	err = environ.Bootstrap(ctx, constraints.Value{})
+	err = environ.Bootstrap(ctx, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	return environ
 }
 
=== modified file 'provider/maas/environ.go'
--- provider/maas/environ.go	2014-04-23 09:33:46 +0000
+++ provider/maas/environ.go	2014-04-24 03:34:13 +0000
@@ -90,8 +90,8 @@
 }
 
 // Bootstrap is specified in the Environ interface.
-func (env *maasEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
-	return common.Bootstrap(ctx, env, cons)
+func (env *maasEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
+	return common.Bootstrap(ctx, env, args)
 }
 
 // StateInfo is specified in the Environ interface.
 
=== modified file 'provider/maas/environ_whitebox_test.go'
--- provider/maas/environ_whitebox_test.go	2014-04-23 09:33:46 +0000
+++ provider/maas/environ_whitebox_test.go	2014-04-24 03:34:13 +0000
@@ -199,7 +199,7 @@
 	lshwXML, err := suite.generateHWTemplate(map[string]string{"aa:bb:cc:dd:ee:f0": "eth0"})
 	c.Assert(err, gc.IsNil)
 	suite.testMAASObject.TestServer.AddNodeDetails("node0", lshwXML)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	// The bootstrap node has been acquired and started.
 	operations := suite.testMAASObject.TestServer.NodeOperations()
@@ -496,7 +496,7 @@
 	lshwXML, err := suite.generateHWTemplate(map[string]string{"aa:bb:cc:dd:ee:f0": "eth0"})
 	c.Assert(err, gc.IsNil)
 	suite.testMAASObject.TestServer.AddNodeDetails("thenode", lshwXML)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 }
 
@@ -512,7 +512,7 @@
 	c.Assert(err, gc.IsNil)
 	err = env.SetConfig(cfg)
 	c.Assert(err, gc.IsNil)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	stripped := strings.Replace(err.Error(), "\n", "", -1)
 	c.Check(stripped,
 		gc.Matches,
@@ -522,7 +522,7 @@
 func (suite *environSuite) TestBootstrapFailsIfNoNodes(c *gc.C) {
 	suite.setupFakeTools(c)
 	env := suite.makeEnviron()
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	// Since there are no nodes, the attempt to allocate one returns a
 	// 409: Conflict.
 	c.Check(err, gc.ErrorMatches, ".*409.*")
 
=== modified file 'provider/manual/environ.go'
--- provider/manual/environ.go	2014-04-22 09:23:39 +0000
+++ provider/manual/environ.go	2014-04-24 03:34:13 +0000
@@ -102,7 +102,7 @@
 	return false
 }
 
-func (e *manualEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
+func (e *manualEnviron) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
 	// Set "use-sshstorage" to false, so agents know not to use sshstorage.
 	cfg, err := e.Config().Apply(map[string]interface{}{"use-sshstorage": false})
 	if err != nil {
@@ -112,6 +112,7 @@
 		return err
 	}
 	envConfig := e.envConfig()
+	// TODO(axw) consider how we can use placement to override bootstrap-host.
 	host := envConfig.bootstrapHost()
 	hc, series, err := manual.DetectSeriesAndHardwareCharacteristics(host)
 	if err != nil {
 
=== modified file 'provider/openstack/live_test.go'
--- provider/openstack/live_test.go	2014-02-18 02:53:44 +0000
+++ provider/openstack/live_test.go	2014-04-24 03:34:13 +0000
@@ -14,7 +14,6 @@
 	"launchpad.net/goose/identity"
 	"launchpad.net/goose/nova"
 
-	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
@@ -230,7 +229,7 @@
 	c.Assert(env, gc.NotNil)
 	defer env.Destroy()
 	// Bootstrap and start an instance.
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	inst, _ := jujutesting.AssertStartInstance(c, env, "100")
 	// Check whether the instance has the default security group assigned.
 
=== modified file 'provider/openstack/local_test.go'
--- provider/openstack/local_test.go	2014-04-22 10:04:16 +0000
+++ provider/openstack/local_test.go	2014-04-24 03:34:13 +0000
@@ -232,7 +232,7 @@
 	c.Assert(err, gc.IsNil)
 	env, err := environs.New(cfg)
 	c.Assert(err, gc.IsNil)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.ErrorMatches, "(.|\n)*cannot allocate a public IP as needed(.|\n)*")
 }
 
@@ -261,7 +261,7 @@
 	c.Assert(err, gc.IsNil)
 	env, err := environs.Prepare(cfg, coretesting.Context(c), s.ConfigStore)
 	c.Assert(err, gc.IsNil)
-	err = bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	inst, _ := testing.AssertStartInstance(c, env, "100")
 	err = env.StopInstances([]instance.Instance{inst})
@@ -270,7 +270,7 @@
 
 func (s *localServerSuite) TestStartInstanceHardwareCharacteristics(c *gc.C) {
 	env := s.Prepare(c)
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 	_, hc := testing.AssertStartInstanceWithConstraints(c, env, "100", constraints.MustParse("mem=1024"))
 	c.Check(*hc.Arch, gc.Equals, "amd64")
@@ -574,7 +574,7 @@
 // It should be moved to environs.jujutests.Tests.
 func (s *localServerSuite) TestBootstrapInstanceUserDataAndState(c *gc.C) {
 	env := s.Prepare(c)
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// check that the state holds the id of the bootstrap machine.
@@ -933,7 +933,7 @@
 	openstack.UseTestImageData(metadataStorage, s.cred)
 	defer openstack.RemoveTestImageData(metadataStorage)
 
-	err = bootstrap.Bootstrap(coretesting.Context(c), s.env, constraints.Value{})
+	err = bootstrap.Bootstrap(coretesting.Context(c), s.env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 }
 
@@ -1076,7 +1076,7 @@
 
 func (s *localServerSuite) TestAllInstancesIgnoresOtherMachines(c *gc.C) {
 	env := s.Prepare(c)
-	err := bootstrap.Bootstrap(coretesting.Context(c), env, constraints.Value{})
+	err := bootstrap.Bootstrap(coretesting.Context(c), env, environs.BootstrapParams{})
 	c.Assert(err, gc.IsNil)
 
 	// Check that we see 1 instance in the environment
 
=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2014-04-22 09:23:39 +0000
+++ provider/openstack/provider.go	2014-04-24 03:34:13 +0000
@@ -566,7 +566,7 @@
 	return stor
 }
 
-func (e *environ) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {
+func (e *environ) Bootstrap(ctx environs.BootstrapContext, args environs.BootstrapParams) error {
 	// The client's authentication may have been reset when finding tools if the agent-version
 	// attribute was updated so we need to re-authenticate. This will be a no-op if already authenticated.
 	// An authenticated client is needed for the URL() call below.
@@ -574,7 +574,7 @@
 	if err != nil {
 		return err
 	}
-	return common.Bootstrap(ctx, e, cons)
+	return common.Bootstrap(ctx, e, args)
 }
 
 func (e *environ) StateInfo() (*state.Info, *api.Info, error) {