Merge lp:~axwalk/juju-core/lp1291292-jujud-bootstrap-nostateurl into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Pass instance-id/hardware directly to jujud

The bootstrap-state agent currently loads its
instance ID and hardware characteristics by
fetching a URL that is written to a file on
disk. This is no longer necessary with
synchronous bootstrap.

I have changed jujud and bootstrap script
generation to pass the instance-id and hardware
characteristics directly to jujud as command
line arguments.

Fixes part of lp:1291292

https://codereview.appspot.com/78840044/

Pass instance-id/hardware directly to jujud

The bootstrap-state agent currently loads its
instance ID and hardware characteristics by
fetching a URL that is written to a file on
disk. This is no longer necessary with
synchronous bootstrap.

I have changed jujud and bootstrap script
generation to pass the instance-id and hardware
characteristics directly to jujud as command
line arguments.

Fixes part of lp:1291292

https://codereview.appspot.com/78840044/

[Andrew Wilkins (axwalk)]

Reviewers: mp+212172_code.launchpad.net,

Message:
Please take a look.

Description:
Pass instance-id/hardware directly to jujud

The bootstrap-state agent currently loads its
instance ID and hardware characteristics by
fetching a URL that is written to a file on
disk. This is no longer necessary with
synchronous bootstrap.

I have changed jujud and bootstrap script
generation to pass the instance-id and hardware
characteristics directly to jujud as command
line arguments.

Fixes part of lp:1291292

https://code.launchpad.net/~axwalk/juju-core/lp1291292-jujud-bootstrap-nostateurl/+merge/212172

(do not edit description out of merge proposal)

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

Affected files (+140, -141 lines):
   A [revision details]
   M cloudinit/sshinit/configure_test.go
   M cmd/jujud/bootstrap.go
   M cmd/jujud/bootstrap_test.go
   M cmd/jujud/main_test.go
   M environs/cloudinit.go
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.go
   M environs/manual/bootstrap.go
   M instance/instance.go
   M provider/common/bootstrap.go
   M provider/common/bootstrap_test.go
   M provider/local/environ.go

[Dimiter Naydenov (dimitern)]

This is great, LGTM, assuming you tested it live.

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

https://codereview.appspot.com/78840044/diff/1/cmd/jujud/bootstrap.go#newcode65
cmd/jujud/bootstrap.go:65: if err = c.Conf.read("machine-0"); err != nil
{
s/=/:=/

https://codereview.appspot.com/78840044/

[Andrew Wilkins (axwalk)]

Please take a look.

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

https://codereview.appspot.com/78840044/diff/1/cmd/jujud/bootstrap.go#newcode65
cmd/jujud/bootstrap.go:65: if err = c.Conf.read("machine-0"); err != nil
{
On 2014/03/21 15:03:24, dimitern wrote:
> s/=/:=/

Done.

https://codereview.appspot.com/78840044/

[Andrew Wilkins (axwalk)]

Please take a look.

https://codereview.appspot.com/78840044/

[Andrew Wilkins (axwalk)]

On 2014/03/21 15:03:23, dimitern wrote:
> This is great, LGTM, assuming you tested it live.

Thanks, yes I have tested with local, manual and openstack.
I realised I could remove LoadStateFromURL altogether, so I went ahead
and did that.

> https://codereview.appspot.com/78840044/diff/1/cmd/jujud/bootstrap.go
> File cmd/jujud/bootstrap.go (right):

https://codereview.appspot.com/78840044/diff/1/cmd/jujud/bootstrap.go#newcode65
> cmd/jujud/bootstrap.go:65: if err = c.Conf.read("machine-0"); err !=
nil {
> s/=/:=/

https://codereview.appspot.com/78840044/

=== modified file 'cloudinit/sshinit/configure_test.go'
--- cloudinit/sshinit/configure_test.go	2014-03-06 12:14:26 +0000
+++ cloudinit/sshinit/configure_test.go	2014-03-24 01:53:33 +0000
@@ -55,7 +55,8 @@
 func (s *configureSuite) getCloudConfig(c *gc.C, stateServer bool, vers version.Binary) *cloudinit.Config {
 	var mcfg *envcloudinit.MachineConfig
 	if stateServer {
-		mcfg = environs.NewBootstrapMachineConfig("http://whatever/dotcom", "private-key")
+		mcfg = environs.NewBootstrapMachineConfig("private-key")
+		mcfg.InstanceId = "instance-id"
 		mcfg.Jobs = []params.MachineJob{params.JobManageEnviron, params.JobHostUnits}
 	} else {
 		mcfg = environs.NewMachineConfig("0", "ya", nil, nil)
 
=== modified file 'cmd/jujud/bootstrap.go'
--- cmd/jujud/bootstrap.go	2014-03-05 16:30:01 +0000
+++ cmd/jujud/bootstrap.go	2014-03-24 01:53:33 +0000
@@ -6,8 +6,6 @@
 import (
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
-	"strings"
 
 	"launchpad.net/gnuflag"
 	"launchpad.net/goyaml"
@@ -16,23 +14,19 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/bootstrap"
-	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 )
 
-// Cloud-init write the URL to be used to load the bootstrap state into this file.
-// A variable is used here to allow tests to override.
-var providerStateURLFile = cloudinit.BootstrapStateURLFile
-
 type BootstrapCommand struct {
 	cmd.CommandBase
 	Conf        AgentConf
 	EnvConfig   map[string]interface{}
 	Constraints constraints.Value
+	Hardware    instance.HardwareCharacteristics
+	InstanceId  string
 }
 
 // Info returns a decription of the command.
@@ -47,6 +41,8 @@
 	c.Conf.addFlags(f)
 	yamlBase64Var(f, &c.EnvConfig, "env-config", "", "initial environment configuration (yaml, base64 encoded)")
 	f.Var(constraints.ConstraintsValue{&c.Constraints}, "constraints", "initial environment constraints (space-separated strings)")
+	f.Var(&c.Hardware, "hardware", "hardware characteristics (space-separated strings)")
+	f.StringVar(&c.InstanceId, "instance-id", "", "unique instance-id for bootstrap machine")
 }
 
 // Init initializes the command for running.
@@ -54,26 +50,19 @@
 	if len(c.EnvConfig) == 0 {
 		return requiredError("env-config")
 	}
+	if c.InstanceId == "" {
+		return requiredError("instance-id")
+	}
 	return c.Conf.checkArgs(args)
 }
 
 // Run initializes state for an environment.
 func (c *BootstrapCommand) Run(_ *cmd.Context) error {
-	data, err := ioutil.ReadFile(providerStateURLFile)
-	if err != nil {
-		return fmt.Errorf("cannot read provider-state-url file: %v", err)
-	}
 	envCfg, err := config.New(config.NoDefaults, c.EnvConfig)
 	if err != nil {
 		return err
 	}
-	stateInfoURL := strings.Split(string(data), "\n")[0]
-	bsState, err := bootstrap.LoadStateFromURL(stateInfoURL, !envCfg.SSLHostnameVerification())
-	if err != nil {
-		return fmt.Errorf("cannot load state from URL %q (read from %q): %v", stateInfoURL, providerStateURLFile, err)
-	}
-	err = c.Conf.read("machine-0")
-	if err != nil {
+	if err := c.Conf.read("machine-0"); err != nil {
 		return err
 	}
 	// agent.Jobs is an optional field in the agent config, and was
@@ -86,15 +75,11 @@
 			params.JobHostUnits,
 		}
 	}
-	var characteristics instance.HardwareCharacteristics
-	if len(bsState.Characteristics) > 0 {
-		characteristics = bsState.Characteristics[0]
-	}
 	st, _, err := c.Conf.config.InitializeState(envCfg, agent.BootstrapMachineConfig{
 		Constraints:     c.Constraints,
 		Jobs:            jobs,
-		InstanceId:      bsState.StateInstances[0],
-		Characteristics: characteristics,
+		InstanceId:      instance.Id(c.InstanceId),
+		Characteristics: c.Hardware,
 	}, state.DefaultDialOpts(), environs.NewStatePolicy())
 	if err != nil {
 		return err
 
=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2014-03-13 07:54:56 +0000
+++ cmd/jujud/bootstrap_test.go	2014-03-24 01:53:33 +0000
@@ -5,8 +5,6 @@
 
 import (
 	"encoding/base64"
-	"io/ioutil"
-	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
@@ -15,8 +13,6 @@
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/bootstrap"
-	"launchpad.net/juju-core/environs/jujutest"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/dummy"
@@ -33,32 +29,15 @@
 type BootstrapSuite struct {
 	testbase.LoggingSuite
 	testing.MgoSuite
-	dataDir              string
-	logDir               string
-	providerStateURLFile string
+	dataDir string
+	logDir  string
 }
 
 var _ = gc.Suite(&BootstrapSuite{})
 
-var testRoundTripper = &jujutest.ProxyRoundTripper{}
-
-func init() {
-	// Prepare mock http transport for provider-state output in tests.
-	testRoundTripper.RegisterForScheme("test")
-}
-
 func (s *BootstrapSuite) SetUpSuite(c *gc.C) {
 	s.LoggingSuite.SetUpSuite(c)
 	s.MgoSuite.SetUpSuite(c)
-	stateInfo := bootstrap.BootstrapState{
-		StateInstances: []instance.Id{instance.Id("dummy.instance.id")},
-	}
-	stateData, err := goyaml.Marshal(stateInfo)
-	c.Assert(err, gc.IsNil)
-	content := map[string]string{"/" + bootstrap.StateFile: string(stateData)}
-	testRoundTripper.Sub = jujutest.NewCannedRoundTripper(content, nil)
-	s.providerStateURLFile = filepath.Join(c.MkDir(), "provider-state-url")
-	providerStateURLFile = s.providerStateURLFile
 }
 
 func (s *BootstrapSuite) TearDownSuite(c *gc.C) {
@@ -85,7 +64,6 @@
 }
 
 func (s *BootstrapSuite) initBootstrapCommand(c *gc.C, jobs []params.MachineJob, args ...string) (machineConf agent.Config, cmd *BootstrapCommand, err error) {
-	ioutil.WriteFile(s.providerStateURLFile, []byte("test://localhost/provider-state\n"), 0600)
 	if len(jobs) == 0 {
 		// Add default jobs.
 		jobs = []params.MachineJob{
@@ -123,7 +101,8 @@
 }
 
 func (s *BootstrapSuite) TestInitializeEnvironment(c *gc.C) {
-	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig)
+	hw := instance.MustParseHardware("arch=amd64 mem=8G")
+	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--instance-id", "anything", "--hardware", hw.String())
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -141,7 +120,12 @@
 
 	instid, err := machines[0].InstanceId()
 	c.Assert(err, gc.IsNil)
-	c.Assert(instid, gc.Equals, instance.Id("dummy.instance.id"))
+	c.Assert(instid, gc.Equals, instance.Id("anything"))
+
+	stateHw, err := machines[0].HardwareCharacteristics()
+	c.Assert(err, gc.IsNil)
+	c.Assert(stateHw, gc.NotNil)
+	c.Assert(*stateHw, gc.DeepEquals, hw)
 
 	cons, err := st.EnvironConstraints()
 	c.Assert(err, gc.IsNil)
@@ -150,7 +134,11 @@
 
 func (s *BootstrapSuite) TestSetConstraints(c *gc.C) {
 	tcons := constraints.Value{Mem: uint64p(2048), CpuCores: uint64p(2)}
-	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--constraints", tcons.String())
+	_, cmd, err := s.initBootstrapCommand(c, nil,
+		"--env-config", testConfig,
+		"--instance-id", "anything",
+		"--constraints", tcons.String(),
+	)
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -182,7 +170,7 @@
 	expectedJobs := []state.MachineJob{
 		state.JobManageEnviron, state.JobHostUnits,
 	}
-	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig)
+	_, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--instance-id", "anything")
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -201,7 +189,7 @@
 
 func (s *BootstrapSuite) TestConfiguredMachineJobs(c *gc.C) {
 	jobs := []params.MachineJob{params.JobManageEnviron}
-	_, cmd, err := s.initBootstrapCommand(c, jobs, "--env-config", testConfig)
+	_, cmd, err := s.initBootstrapCommand(c, jobs, "--env-config", testConfig, "--instance-id", "anything")
 	c.Assert(err, gc.IsNil)
 	err = cmd.Run(nil)
 	c.Assert(err, gc.IsNil)
@@ -231,7 +219,7 @@
 }
 
 func (s *BootstrapSuite) TestInitialPassword(c *gc.C) {
-	machineConf, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig)
+	machineConf, cmd, err := s.initBootstrapCommand(c, nil, "--env-config", testConfig, "--instance-id", "anything")
 	c.Assert(err, gc.IsNil)
 
 	err = cmd.Run(nil)
@@ -270,35 +258,65 @@
 	defer st.Close()
 }
 
-var base64ConfigTests = []struct {
-	input    []string
-	err      string
-	expected map[string]interface{}
+var bootstrapArgTests = []struct {
+	input              []string
+	err                string
+	expectedInstanceId string
+	expectedHardware   instance.HardwareCharacteristics
+	expectedConfig     map[string]interface{}
 }{
 	{
-		// no value supplied
-		nil,
-		"--env-config option must be set",
-		nil,
+		// no value supplied for env-config
+		err: "--env-config option must be set",
 	}, {
-		// empty
-		[]string{"--env-config", ""},
-		"--env-config option must be set",
-		nil,
+		// empty env-config
+		input: []string{"--env-config", ""},
+		err:   "--env-config option must be set",
 	}, {
 		// wrong, should be base64
-		[]string{"--env-config", "name: banana\n"},
-		".*illegal base64 data at input byte.*",
-		nil,
-	}, {
-		[]string{"--env-config", base64.StdEncoding.EncodeToString([]byte("name: banana\n"))},
-		"",
-		map[string]interface{}{"name": "banana"},
+		input: []string{"--env-config", "name: banana\n"},
+		err:   ".*illegal base64 data at input byte.*",
+	}, {
+		// no value supplied for instance-id
+		input: []string{
+			"--env-config", base64.StdEncoding.EncodeToString([]byte("name: banana\n")),
+		},
+		err: "--instance-id option must be set",
+	}, {
+		// empty instance-id
+		input: []string{
+			"--env-config", base64.StdEncoding.EncodeToString([]byte("name: banana\n")),
+			"--instance-id", "",
+		},
+		err: "--instance-id option must be set",
+	}, {
+		input: []string{
+			"--env-config", base64.StdEncoding.EncodeToString([]byte("name: banana\n")),
+			"--instance-id", "anything",
+		},
+		expectedInstanceId: "anything",
+		expectedConfig:     map[string]interface{}{"name": "banana"},
+	}, {
+		input: []string{
+			"--env-config", base64.StdEncoding.EncodeToString([]byte("name: banana\n")),
+			"--instance-id", "anything",
+			"--hardware", "nonsense",
+		},
+		err: `invalid value "nonsense" for flag --hardware: malformed characteristic "nonsense"`,
+	}, {
+		input: []string{
+			"--env-config", base64.StdEncoding.EncodeToString([]byte("name: banana\n")),
+			"--instance-id", "anything",
+			"--hardware", "arch=amd64 cpu-cores=4 root-disk=2T",
+		},
+		expectedInstanceId: "anything",
+		expectedHardware:   instance.MustParseHardware("arch=amd64 cpu-cores=4 root-disk=2T"),
+		expectedConfig:     map[string]interface{}{"name": "banana"},
 	},
 }
 
-func (s *BootstrapSuite) TestBase64Config(c *gc.C) {
-	for i, t := range base64ConfigTests {
+func (s *BootstrapSuite) TestBootstrapArgs(c *gc.C) {
+	for i, t := range bootstrapArgTests {
 		c.Logf("test %d", i)
 		var args []string
 		args = append(args, t.input...)
@@ -306,7 +324,9 @@
 		if t.err == "" {
 			c.Assert(cmd, gc.NotNil)
 			c.Assert(err, gc.IsNil)
-			c.Assert(cmd.EnvConfig, gc.DeepEquals, t.expected)
+			c.Assert(cmd.EnvConfig, gc.DeepEquals, t.expectedConfig)
+			c.Assert(cmd.InstanceId, gc.Equals, t.expectedInstanceId)
+			c.Assert(cmd.Hardware, gc.DeepEquals, t.expectedHardware)
 		} else {
 			c.Assert(err, gc.ErrorMatches, t.err)
 		}
 
=== modified file 'cmd/jujud/main_test.go'
--- cmd/jujud/main_test.go	2014-03-19 03:48:12 +0000
+++ cmd/jujud/main_test.go	2014-03-24 01:53:33 +0000
@@ -110,6 +110,7 @@
 	checkMessage(c, msga,
 		"bootstrap-state",
 		"--env-config", b64yaml{"blah": "blah"}.encode(),
+		"--instance-id", "inst",
 		"toastie")
 	checkMessage(c, msga, "unit",
 		"--unit-name", "un/0",
 
=== modified file 'environs/bootstrap/state.go'
--- environs/bootstrap/state.go	2014-03-12 10:59:17 +0000
+++ environs/bootstrap/state.go	2014-03-24 01:53:33 +0000
@@ -8,7 +8,6 @@
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net/http"
 
 	"launchpad.net/goyaml"
 
@@ -16,7 +15,6 @@
 	"launchpad.net/juju-core/environs/storage"
 	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/utils"
 )
 
 // StateFile is the name of the file where the provider's state is stored.
@@ -68,24 +66,6 @@
 	return putState(storage, data)
 }
 
-// LoadStateFromURL reads state from the given URL.
-func LoadStateFromURL(url string, disableSSLHostnameVerification bool) (*BootstrapState, error) {
-	logger.Debugf("loading %q from %q", StateFile, url)
-	client := http.DefaultClient
-	if disableSSLHostnameVerification {
-		logger.Infof("hostname SSL verification disabled")
-		client = utils.GetNonValidatingHTTPClient()
-	}
-	resp, err := client.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("could not load state from url: %v %s", url, resp.Status)
-	}
-	return loadState(resp.Body)
-}
-
 // LoadState reads state from the given storage.
 func LoadState(stor storage.StorageReader) (*BootstrapState, error) {
 	r, err := storage.Get(stor, StateFile)
 
=== modified file 'environs/bootstrap/state_test.go'
--- environs/bootstrap/state_test.go	2014-03-13 07:54:56 +0000
+++ environs/bootstrap/state_test.go	2014-03-24 01:53:33 +0000
@@ -125,33 +125,6 @@
 	c.Check(*storedState, gc.DeepEquals, state)
 }
 
-func (suite *StateSuite) TestLoadStateFromURLReadsStateFile(c *gc.C) {
-	storage, dataDir := suite.newStorageWithDataDir(c)
-	state := suite.setUpSavedState(c, dataDir)
-	url, err := storage.URL(bootstrap.StateFile)
-	c.Assert(err, gc.IsNil)
-	storedState, err := bootstrap.LoadStateFromURL(url, false)
-	c.Assert(err, gc.IsNil)
-	c.Check(*storedState, gc.DeepEquals, state)
-}
-
-func (suite *StateSuite) TestLoadStateFromURLBadCert(c *gc.C) {
-	baseURL, _ := suite.testingHTTPSServer(c)
-	url := baseURL + "/" + bootstrap.StateFile
-	storedState, err := bootstrap.LoadStateFromURL(url, false)
-	c.Assert(err, gc.ErrorMatches, ".*/provider-state:.* certificate signed by unknown authority")
-	c.Assert(storedState, gc.IsNil)
-}
-
-func (suite *StateSuite) TestLoadStateFromURLBadCertPermitted(c *gc.C) {
-	baseURL, dataDir := suite.testingHTTPSServer(c)
-	state := suite.setUpSavedState(c, dataDir)
-	url := baseURL + "/" + bootstrap.StateFile
-	storedState, err := bootstrap.LoadStateFromURL(url, true)
-	c.Assert(err, gc.IsNil)
-	c.Check(*storedState, gc.DeepEquals, state)
-}
-
 func (suite *StateSuite) TestLoadStateMissingFile(c *gc.C) {
 	stor := suite.newStorage(c)
 	_, err := bootstrap.LoadState(stor)
 
=== modified file 'environs/cloudinit.go'
--- environs/cloudinit.go	2014-03-12 02:28:30 +0000
+++ environs/cloudinit.go	2014-03-24 01:53:33 +0000
@@ -57,13 +57,11 @@
 // NewBootstrapMachineConfig sets up a basic machine configuration for a
 // bootstrap node.  You'll still need to supply more information, but this
 // takes care of the fixed entries and the ones that are always needed.
-// stateInfoURL is the storage URL for the environment's state file.
-func NewBootstrapMachineConfig(stateInfoURL string, privateSystemSSHKey string) *cloudinit.MachineConfig {
+func NewBootstrapMachineConfig(privateSystemSSHKey string) *cloudinit.MachineConfig {
 	// For a bootstrap instance, FinishMachineConfig will provide the
 	// state.Info and the api.Info. The machine id must *always* be "0".
 	mcfg := NewMachineConfig("0", state.BootstrapNonce, nil, nil)
 	mcfg.StateServer = true
-	mcfg.StateInfoURL = stateInfoURL
 	mcfg.SystemPrivateSSHKey = privateSystemSSHKey
 	mcfg.Jobs = []params.MachineJob{params.JobManageEnviron, params.JobHostUnits}
 	return mcfg
 
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2014-03-18 22:20:40 +0000
+++ environs/cloudinit/cloudinit.go	2014-03-24 01:53:33 +0000
@@ -31,12 +31,6 @@
 	"launchpad.net/juju-core/version"
 )
 
-// BootstrapStateURLFile is used to communicate to the first bootstrap node
-// the URL from which to obtain important state information (instance id and
-// hardware characteristics). It is a transient file, only used as the node
-// is bootstrapping.
-const BootstrapStateURLFile = "/tmp/provider-state-url"
-
 // SystemIdentity is the name of the file where the environment SSH key is kept.
 const SystemIdentity = "system-identity"
 
@@ -79,6 +73,15 @@
 	// or be empty when starting a state server.
 	APIInfo *api.Info
 
+	// InstanceId is the instance ID of the machine being initialised.
+	// This is required when bootstrapping, and ignored otherwise.
+	InstanceId instance.Id
+
+	// HardwareCharacteristics contains the harrdware characteristics of
+	// the machine being initialised. This optional, and is only used by
+	// the bootstrap agent during state initialisation.
+	HardwareCharacteristics *instance.HardwareCharacteristics
+
 	// MachineNonce is set at provisioning/bootstrap time and used to
 	// ensure the agent is running on the correct instance.
 	MachineNonce string
@@ -128,9 +131,6 @@
 	// Constraints holds the initial environment constraints.
 	Constraints constraints.Value
 
-	// StateInfoURL is the URL of a file which contains information about the state server machines.
-	StateInfoURL string
-
 	// DisableSSLHostnameVerification can be set to true to tell cloud-init
 	// that it shouldn't verify SSL certificates
 	DisableSSLHostnameVerification bool
@@ -393,13 +393,20 @@
 		if cons != "" {
 			cons = " --constraints " + shquote(cons)
 		}
+		var hardware string
+		if cfg.HardwareCharacteristics != nil {
+			if hardware = cfg.HardwareCharacteristics.String(); hardware != "" {
+				hardware = " --hardware " + shquote(hardware)
+			}
+		}
 		c.AddRunCmd(cloudinit.LogProgressCmd("Bootstrapping Juju machine agent"))
 		c.AddScripts(
-			fmt.Sprintf("echo %s > %s", shquote(cfg.StateInfoURL), BootstrapStateURLFile),
 			// The bootstrapping is always run with debug on.
 			cfg.jujuTools()+"/jujud bootstrap-state"+
 				" --data-dir "+shquote(cfg.DataDir)+
 				" --env-config "+shquote(base64yaml(cfg.Config))+
+				" --instance-id "+shquote(string(cfg.InstanceId))+
+				hardware+
 				cons+
 				" --debug",
 			"rm -rf "+shquote(acfg.Dir()),
@@ -701,6 +708,9 @@
 		if cfg.SystemPrivateSSHKey == "" {
 			return fmt.Errorf("missing system ssh identity")
 		}
+		if cfg.InstanceId == "" {
+			return fmt.Errorf("missing instance-id")
+		}
 	} else {
 		if len(cfg.StateInfo.Addrs) == 0 {
 			return fmt.Errorf("missing state hosts")
 
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-03-19 02:27:03 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-03-24 01:53:33 +0000
@@ -101,7 +101,7 @@
 			LogDir:                  agent.DefaultLogDir,
 			Jobs:                    allMachineJobs,
 			CloudInitOutputLog:      environs.CloudInitOutputLog,
-			StateInfoURL:            "some-url",
+			InstanceId:              "i-bootstrap",
 			SystemPrivateSSHKey:     "private rsa key",
 			MachineAgentServiceName: "jujud-machine-0",
 			MongoServiceName:        "juju-db",
@@ -147,8 +147,7 @@
 install -m 600 /dev/null '/var/lib/juju/agents/bootstrap/agent\.conf'
 printf '%s\\n' '.*' > '/var/lib/juju/agents/bootstrap/agent\.conf'
 echo 'Bootstrapping Juju machine agent'.*
-echo 'some-url' > /tmp/provider-state-url
-/var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --constraints 'mem=2048M' --debug
+/var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --instance-id 'i-bootstrap' --constraints 'mem=2048M' --debug
 rm -rf '/var/lib/juju/agents/bootstrap'
 ln -s 1\.2\.3-precise-amd64 '/var/lib/juju/tools/machine-0'
 echo 'Starting Juju machine agent \(jujud-machine-0\)'.*
@@ -182,7 +181,7 @@
 			LogDir:                  agent.DefaultLogDir,
 			Jobs:                    allMachineJobs,
 			CloudInitOutputLog:      environs.CloudInitOutputLog,
-			StateInfoURL:            "some-url",
+			InstanceId:              "i-bootstrap",
 			SystemPrivateSSHKey:     "private rsa key",
 			MachineAgentServiceName: "jujud-machine-0",
 			MongoServiceName:        "juju-db",
@@ -196,7 +195,7 @@
 grep '1234' \$bin/juju1\.2\.3-raring-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\)
 rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-raring-amd64\.sha256
 printf %s '{"version":"1\.2\.3-raring-amd64","url":"http://foo\.com/tools/releases/juju1\.2\.3-raring-amd64\.tgz","sha256":"1234","size":10}' > \$bin/downloaded-tools\.txt
-/var/lib/juju/tools/1\.2\.3-raring-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --constraints 'mem=2048M' --debug
+/var/lib/juju/tools/1\.2\.3-raring-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --instance-id 'i-bootstrap' --constraints 'mem=2048M' --debug
 rm -rf '/var/lib/juju/agents/bootstrap'
 ln -s 1\.2\.3-raring-amd64 '/var/lib/juju/tools/machine-0'
 `,
@@ -227,7 +226,7 @@
 			LogDir:                  agent.DefaultLogDir,
 			Jobs:                    allMachineJobs,
 			CloudInitOutputLog:      environs.CloudInitOutputLog,
-			StateInfoURL:            "some-url",
+			InstanceId:              "i-bootstrap",
 			SystemPrivateSSHKey:     "private rsa key",
 			MachineAgentServiceName: "jujud-machine-0",
 			MongoServiceName:        "juju-db",
@@ -386,7 +385,7 @@
 			LogDir:                  agent.DefaultLogDir,
 			Jobs:                    allMachineJobs,
 			CloudInitOutputLog:      environs.CloudInitOutputLog,
-			StateInfoURL:            "some-url",
+			InstanceId:              "i-bootstrap",
 			SystemPrivateSSHKey:     "private rsa key",
 			MachineAgentServiceName: "jujud-machine-0",
 			MongoServiceName:        "juju-db",
@@ -394,7 +393,7 @@
 		setEnvConfig: true,
 		inexactMatch: true,
 		expectScripts: `
-/var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --debug
+/var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --instance-id 'i-bootstrap' --debug
 `,
 	},
 }
@@ -783,6 +782,9 @@
 	{"missing mongo service name", func(cfg *cloudinit.MachineConfig) {
 		cfg.MongoServiceName = ""
 	}},
+	{"missing instance-id", func(cfg *cloudinit.MachineConfig) {
+		cfg.InstanceId = ""
+	}},
 }
 
 // TestCloudInitVerify checks that required fields are appropriately
@@ -812,6 +814,7 @@
 		LogDir:                  agent.DefaultLogDir,
 		Jobs:                    normalMachineJobs,
 		CloudInitOutputLog:      environs.CloudInitOutputLog,
+		InstanceId:              "i-bootstrap",
 		MachineNonce:            "FAKE_NONCE",
 		SystemPrivateSSHKey:     "private rsa key",
 		MachineAgentServiceName: "jujud-machine-99",
 
=== modified file 'environs/manual/bootstrap.go'
--- environs/manual/bootstrap.go	2014-02-20 02:24:46 +0000
+++ environs/manual/bootstrap.go	2014-03-24 01:53:33 +0000
@@ -124,8 +124,9 @@
 	}
 
 	// Finally, provision the machine agent.
-	stateFileURL := fmt.Sprintf("file://%s/%s", storageDir, bootstrap.StateFile)
-	mcfg := environs.NewBootstrapMachineConfig(stateFileURL, privateKey)
+	mcfg := environs.NewBootstrapMachineConfig(privateKey)
+	mcfg.InstanceId = BootstrapInstanceId
+	mcfg.HardwareCharacteristics = args.HardwareCharacteristics
 	if args.DataDir != "" {
 		mcfg.DataDir = args.DataDir
 	}
 
=== modified file 'instance/instance.go'
--- instance/instance.go	2014-03-21 11:00:41 +0000
+++ instance/instance.go	2014-03-24 01:53:33 +0000
@@ -112,6 +112,16 @@
 	return strings.Join(strs, " ")
 }
 
+// Implement gnuflag.Value
+func (hc *HardwareCharacteristics) Set(s string) error {
+	parsed, err := ParseHardware(s)
+	if err != nil {
+		return err
+	}
+	*hc = parsed
+	return nil
+}
+
 // MustParseHardware constructs a HardwareCharacteristics from the supplied arguments,
 // as Parse, but panics on failure.
 func MustParseHardware(args ...string) HardwareCharacteristics {
 
=== modified file 'provider/common/bootstrap.go'
--- provider/common/bootstrap.go	2014-03-19 02:55:15 +0000
+++ provider/common/bootstrap.go	2014-03-24 01:53:33 +0000
@@ -56,19 +56,11 @@
 		return fmt.Errorf("no SSH client available")
 	}
 
-	// Create an empty bootstrap state file so we can get its URL.
-	// It will be updated with the instance id and hardware characteristics
-	// after the bootstrap instance is started.
-	stateFileURL, err := bootstrap.CreateStateFile(env.Storage())
-	if err != nil {
-		return err
-	}
-
 	privateKey, err := GenerateSystemSSHKey(env)
 	if err != nil {
 		return err
 	}
-	machineConfig := environs.NewBootstrapMachineConfig(stateFileURL, privateKey)
+	machineConfig := environs.NewBootstrapMachineConfig(privateKey)
 
 	fmt.Fprintln(ctx.GetStderr(), "Launching instance")
 	inst, hw, err := env.StartInstance(environs.StartInstanceParams{
@@ -80,6 +72,8 @@
 		return fmt.Errorf("cannot start bootstrap instance: %v", err)
 	}
 	fmt.Fprintf(ctx.GetStderr(), " - %s\n", inst.Id())
+	machineConfig.InstanceId = inst.Id()
+	machineConfig.HardwareCharacteristics = hw
 
 	var characteristics []instance.HardwareCharacteristics
 	if hw != nil {
 
=== modified file 'provider/common/bootstrap_test.go'
--- provider/common/bootstrap_test.go	2014-03-19 22:16:15 +0000
+++ provider/common/bootstrap_test.go	2014-03-24 01:53:33 +0000
@@ -15,7 +15,6 @@
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/storage"
@@ -76,21 +75,7 @@
 	return func() *config.Config { return cfg }
 }
 
-func (s *BootstrapSuite) TestCannotWriteStateFile(c *gc.C) {
-	brokenStorage := &mockStorage{
-		Storage: newStorage(s, c),
-		putErr:  fmt.Errorf("noes!"),
-	}
-	env := &mockEnviron{storage: brokenStorage, config: configGetter(c)}
-	ctx := coretesting.Context(c)
-	err := common.Bootstrap(ctx, env, constraints.Value{})
-	c.Assert(err, gc.ErrorMatches, "cannot create initial state file: noes!")
-}
-
 func (s *BootstrapSuite) TestCannotStartInstance(c *gc.C) {
-	stor := newStorage(s, c)
-	checkURL, err := stor.URL(bootstrap.StateFile)
-	c.Assert(err, gc.IsNil)
 	checkCons := constraints.MustParse("mem=8G")
 
 	startInstance := func(
@@ -99,18 +84,18 @@
 		instance.Instance, *instance.HardwareCharacteristics, error,
 	) {
 		c.Assert(cons, gc.DeepEquals, checkCons)
-		c.Assert(mcfg, gc.DeepEquals, environs.NewBootstrapMachineConfig(checkURL, mcfg.SystemPrivateSSHKey))
+		c.Assert(mcfg, gc.DeepEquals, environs.NewBootstrapMachineConfig(mcfg.SystemPrivateSSHKey))
 		return nil, nil, fmt.Errorf("meh, not started")
 	}
 
 	env := &mockEnviron{
-		storage:       stor,
+		storage:       newStorage(s, c),
 		startInstance: startInstance,
 		config:        configGetter(c),
 	}
 
 	ctx := coretesting.Context(c)
-	err = common.Bootstrap(ctx, env, checkCons)
+	err := common.Bootstrap(ctx, env, checkCons)
 	c.Assert(err, gc.ErrorMatches, "cannot start bootstrap instance: meh, not started")
 }
 
@@ -192,13 +177,11 @@
 	checkInstanceId := "i-success"
 	checkHardware := instance.MustParseHardware("mem=2T")
 
-	checkURL := ""
 	startInstance := func(
 		_ constraints.Value, _ environs.Networks, _ tools.List, mcfg *cloudinit.MachineConfig,
 	) (
 		instance.Instance, *instance.HardwareCharacteristics, error,
 	) {
-		checkURL = mcfg.StateInfoURL
 		return &mockInstance{id: checkInstanceId}, &checkHardware, nil
 	}
 	var mocksConfig = minimalConfig(c)
@@ -226,12 +209,6 @@
 	err := common.Bootstrap(ctx, env, constraints.Value{})
 	c.Assert(err, gc.IsNil)
 
-	savedState, err := bootstrap.LoadStateFromURL(checkURL, false)
-	c.Assert(err, gc.IsNil)
-	c.Assert(savedState, gc.DeepEquals, &bootstrap.BootstrapState{
-		StateInstances:  []instance.Id{instance.Id(checkInstanceId)},
-		Characteristics: []instance.HardwareCharacteristics{checkHardware},
-	})
 	authKeys := env.Config().AuthorizedKeys()
 	c.Assert(authKeys, gc.Not(gc.Equals), originalAuthKeys)
 	c.Assert(authKeys, jc.HasSuffix, "juju-system-key\n")
 
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2014-03-19 21:08:58 +0000
+++ provider/local/environ.go	2014-03-24 01:53:33 +0000
@@ -109,10 +109,6 @@
 
 	// Before we write the agent config file, we need to make sure the
 	// instance is saved in the StateInfo.
-	stateFileURL, err := bootstrap.CreateStateFile(env.Storage())
-	if err != nil {
-		return err
-	}
 	if err := bootstrap.SaveState(env.Storage(), &bootstrap.BootstrapState{
 		StateInstances: []instance.Id{bootstrapInstanceId},
 	}); err != nil {
@@ -138,7 +134,8 @@
 		return err
 	}
 
-	mcfg := environs.NewBootstrapMachineConfig(stateFileURL, privateKey)
+	mcfg := environs.NewBootstrapMachineConfig(privateKey)
+	mcfg.InstanceId = bootstrapInstanceId
 	mcfg.Tools = selectedTools[0]
 	mcfg.DataDir = env.config.rootDir()
 	mcfg.LogDir = fmt.Sprintf("/var/log/juju-%s", env.config.namespace())