Merge lp:~thumper/juju-core/environ-bootstrap into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Move state initialization out of jujud bootstrap

Methods to configure the initial state connection and dealing
with passwords were inside the jujud bootstrap command, which
isn't going to be used by the local provider, so the functions
need to be extracted.

https://codereview.appspot.com/10990043/

Move state initialization out of jujud bootstrap

Methods to configure the initial state connection and dealing
with passwords were inside the jujud bootstrap command, which
isn't going to be used by the local provider, so the functions
need to be extracted.

https://codereview.appspot.com/10990043/

[Tim Penhey (thumper)]

Reviewers: mp+173390_code.launchpad.net,

Message:
Please take a look.

Description:
Move state initialization out of jujud bootstrap

Methods to configure the initial state connection and dealing
with passwords were inside the jujud bootstrap command, which
isn't going to be used by the local provider, so the functions
need to be extracted.

https://code.launchpad.net/~thumper/juju-core/environ-bootstrap/+merge/173390

Requires:
https://code.launchpad.net/~thumper/juju-core/local-provider-storage/+merge/173386

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M cmd/jujud/bootstrap.go
   M environs/bootstrap.go

[Frank Mueller (themue)]

LGTM, only one wish for a name change.

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go
File environs/bootstrap.go (right):

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode66
environs/bootstrap.go:66:
On 2013/07/08 01:55:38, dfc wrote:
> comment please

+1

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode67
environs/bootstrap.go:67: func BootstrapMongoUsers(st *state.State, cfg
*config.Config, passwordHash string) error {
Would prefer a technology independent name here:

- BootstrapUsers()
- BootstrapDatabaseUsers()
- BootstrapstateUsers()
- ...

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode89
environs/bootstrap.go:89:
On 2013/07/08 01:55:38, dfc wrote:
> comment please

+1

https://codereview.appspot.com/10990043/

[Tim Penhey (thumper)]

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go
File environs/bootstrap.go (right):

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode66
environs/bootstrap.go:66:
On 2013/07/08 08:44:14, mue wrote:
> On 2013/07/08 01:55:38, dfc wrote:
> > comment please

> +1

Done.

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode67
environs/bootstrap.go:67: func BootstrapMongoUsers(st *state.State, cfg
*config.Config, passwordHash string) error {
On 2013/07/08 08:44:14, mue wrote:
> Would prefer a technology independent name here:

> - BootstrapUsers()
> - BootstrapDatabaseUsers()
> - BootstrapstateUsers()
> - ...

BootstrapUsers it is.

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode68
environs/bootstrap.go:68: logger.Debugf("add admin user")
On 2013/07/08 01:55:38, dfc wrote:
> adding admin user

Done.

https://codereview.appspot.com/10990043/diff/1/environs/bootstrap.go#newcode89
environs/bootstrap.go:89:
On 2013/07/08 08:44:14, mue wrote:
> On 2013/07/08 01:55:38, dfc wrote:
> > comment please

> +1

Done.

https://codereview.appspot.com/10990043/

=== modified file 'cmd/jujud/bootstrap.go'
--- cmd/jujud/bootstrap.go	2013-06-21 15:35:28 +0000
+++ cmd/jujud/bootstrap.go	2013-07-08 22:52:25 +0000
@@ -11,11 +11,8 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/environs/agent"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/state"
-	"launchpad.net/juju-core/utils"
-	"launchpad.net/juju-core/version"
 )
 
 type BootstrapCommand struct {
@@ -65,41 +62,10 @@
 	}
 	defer st.Close()
 
-	if err := st.SetEnvironConstraints(c.Constraints); err != nil {
-		return err
-	}
-	if err := c.configureBootstrapMachine(st, cfg); err != nil {
-		return err
-	}
-
-	// Set up initial authentication.
-	u, err := st.AddUser("admin", "")
-	if err != nil {
-		return err
-	}
-
-	// Note that at bootstrap time, the password is set to
-	// the hash of its actual value. The first time a client
-	// connects to mongo, it changes the mongo password
-	// to the original password.
-	if err := u.SetPasswordHash(c.Conf.OldPassword); err != nil {
-		return err
-	}
-	if err := st.SetAdminMongoPassword(c.Conf.OldPassword); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *BootstrapCommand) configureBootstrapMachine(st *state.State, cfg *config.Config) error {
-	provider, err := environs.Provider(cfg.Type())
-	if err != nil {
-		return err
-	}
-	instanceId, err := provider.InstanceId()
-	if err != nil {
-		return err
-	}
+	if err := environs.BootstrapUsers(st, cfg, c.Conf.OldPassword); err != nil {
+		return err
+	}
+
 	// TODO(fwereade): we need to be able to customize machine jobs,
 	// not just hardcode these values; in particular, JobHostUnits
 	// on a machine, like this one, that is running JobManageEnviron
@@ -116,35 +82,8 @@
 	jobs := []state.MachineJob{
 		state.JobManageEnviron, state.JobManageState, state.JobHostUnits,
 	}
-	m, err := st.InjectMachine(version.Current.Series, c.Constraints, instanceId, jobs...)
-	if err != nil {
-		return err
-	}
-	// Read the machine agent's password and change it to
-	// a new password (other agents will change their password
-	// via the API connection).
-	mconf, err := agent.ReadConf(c.Conf.DataDir, m.Tag())
-	if err != nil {
-		return err
-	}
-	newPassword, err := utils.RandomPassword()
-	if err != nil {
-		return err
-	}
-	mconf.StateInfo.Password = newPassword
-	mconf.APIInfo.Password = newPassword
-	mconf.OldPassword = ""
 
-	if err := mconf.Write(); err != nil {
-		return err
-	}
-	if err := m.SetMongoPassword(newPassword); err != nil {
-		return err
-	}
-	if err := m.SetPassword(newPassword); err != nil {
-		return err
-	}
-	return nil
+	return environs.ConfigureBootstrapMachine(st, cfg, c.Constraints, c.Conf.DataDir, jobs)
 }
 
 // yamlBase64Value implements gnuflag.Value on a map[string]interface{}.

=== modified file 'environs/bootstrap.go'
--- environs/bootstrap.go	2013-07-04 23:05:57 +0000
+++ environs/bootstrap.go	2013-07-08 22:52:25 +0000
@@ -7,8 +7,12 @@
 	"fmt"
 
 	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs/agent"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/errors"
+	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/utils"
+	"launchpad.net/juju-core/version"
 )
 
 // Bootstrap bootstraps the given environment. The supplied constraints are
@@ -59,3 +63,86 @@
 
 	return VerifyStorage(env.Storage())
 }
+
+// BootstrapUsers creates the initial admin user for the database, and sets
+// the initial password.
+func BootstrapUsers(st *state.State, cfg *config.Config, passwordHash string) error {
+	logger.Debugf("adding admin user")
+	// Set up initial authentication.
+	u, err := st.AddUser("admin", "")
+	if err != nil {
+		return err
+	}
+
+	// Note that at bootstrap time, the password is set to
+	// the hash of its actual value. The first time a client
+	// connects to mongo, it changes the mongo password
+	// to the original password.
+	logger.Debugf("setting password hash for admin user")
+	if err := u.SetPasswordHash(passwordHash); err != nil {
+		return err
+	}
+	if err := st.SetAdminMongoPassword(passwordHash); err != nil {
+		return err
+	}
+	return nil
+
+}
+
+// ConfigureBootstrapMachine adds the initial machine into state.  As a part
+// of this process the environmental constraints are saved as constraints used
+// when bootstrapping are considered constraints for the entire environment.
+func ConfigureBootstrapMachine(
+	st *state.State,
+	cfg *config.Config,
+	cons constraints.Value,
+	datadir string,
+	jobs []state.MachineJob,
+) error {
+	logger.Debugf("setting environment constraints")
+	if err := st.SetEnvironConstraints(cons); err != nil {
+		return err
+	}
+
+	logger.Debugf("configure bootstrap machine")
+	provider, err := Provider(cfg.Type())
+	if err != nil {
+		return err
+	}
+	instanceId, err := provider.InstanceId()
+	if err != nil {
+		return err
+	}
+
+	logger.Debugf("create bootstrap machine in state")
+	m, err := st.InjectMachine(version.Current.Series, cons, instanceId, jobs...)
+	if err != nil {
+		return err
+	}
+	// Read the machine agent's password and change it to
+	// a new password (other agents will change their password
+	// via the API connection).
+	logger.Debugf("create new random password for machine %v", m.Id())
+	mconf, err := agent.ReadConf(datadir, m.Tag())
+	if err != nil {
+		return err
+	}
+	newPassword, err := utils.RandomPassword()
+	if err != nil {
+		return err
+	}
+	mconf.StateInfo.Password = newPassword
+	mconf.APIInfo.Password = newPassword
+	mconf.OldPassword = ""
+
+	if err := mconf.Write(); err != nil {
+		return err
+	}
+	if err := m.SetMongoPassword(newPassword); err != nil {
+		return err
+	}
+	if err := m.SetPassword(newPassword); err != nil {
+		return err
+	}
+	return nil
+}