environs: add machineNonce to StartInstance()

environs/ec2/ec2.go

Index: environs/ec2/ec2.go
=== modified file 'environs/ec2/ec2.go'
--- environs/ec2/ec2.go	2013-04-05 15:47:26 +0000
+++ environs/ec2/ec2.go	2013-04-05 16:50:25 +0000
@@ -287,9 +287,10 @@
 	}
 	mongoURL := environs.MongoURL(e, tools.Series, tools.Arch)
 	inst, err := e.startInstance(&startInstanceParams{
-		machineId:   "0",
-		series:      tools.Series,
-		constraints: cons,
+		machineId:    "0",
+		machineNonce: state.BootstrapNonce,
+		series:       tools.Series,
+		constraints:  cons,
 		info: &state.Info{
 			Password: trivial.PasswordHash(password),
 			CACert:   caCert,
@@ -379,13 +380,14 @@
 	return state.AssignNew
 }
 
-func (e *environ) StartInstance(machineId string, series string, cons constraints.Value, info *state.Info, apiInfo *api.Info) (environs.Instance, error) {
+func (e *environ) StartInstance(machineId, machineNonce string, series string, cons constraints.Value, info *state.Info, apiInfo *api.Info) (environs.Instance, error) {
 	return e.startInstance(&startInstanceParams{
-		machineId:   machineId,
-		series:      series,
-		constraints: cons,
-		info:        info,
-		apiInfo:     apiInfo,
+		machineId:    machineId,
+		machineNonce: machineNonce,
+		series:       series,
+		constraints:  cons,
+		info:         info,
+		apiInfo:      apiInfo,
 	})
 }
 
@@ -400,13 +402,12 @@
 		StateServerKey:  scfg.stateServerKey,
 		DataDir:         "/var/lib/juju",
 		Tools:           scfg.tools,
-		// TODO(dimitern) this will change in a follow-up, when we start using it.
-		MachineNonce:   "FAKE_NONCE",
-		MongoURL:       scfg.mongoURL,
-		MachineId:      scfg.machineId,
-		AuthorizedKeys: e.ecfg().AuthorizedKeys(),
-		Config:         scfg.config,
-		Constraints:    scfg.constraints,
+		MachineNonce:    scfg.machineNonce,
+		MongoURL:        scfg.mongoURL,
+		MachineId:       scfg.machineId,
+		AuthorizedKeys:  e.ecfg().AuthorizedKeys(),
+		Config:          scfg.config,
+		Constraints:     scfg.constraints,
 	}
 	cloudcfg, err := cloudinit.New(cfg)
 	if err != nil {
@@ -423,6 +424,7 @@
 
 type startInstanceParams struct {
 	machineId       string
+	machineNonce    string
 	series          string
 	constraints     constraints.Value
 	info            *state.Info