← Back to branch summary

~fwereade/juju-core/unit-remove-depart-scopes

« back to all changes in this revision

Viewing changes to provider/local/environ.go

  • Committer: William Reade
  • Date: 2013-11-07 17:30:38 UTC
  • mfrom: (2032.1.6 juju-core)
  • Revision ID: fwereade@gmail.com-20131107173038-d0a72q96dujotc0z
merge parent

Show diffs side-by-side

added added

removed removed

Lines of Context:
provider/local/environ.go
488
488
 
489
489
func (env *localEnviron) writeBootstrapAgentConfFile(secret string, cert, key []byte) (agent.Config, error) {
490
490
        tag := names.MachineTag("0")
491
 
        passwordHash := utils.PasswordHash(secret)
 
491
        passwordHash := utils.UserPasswordHash(secret, utils.CompatSalt)
492
492
        // We don't check the existance of the CACert here as if it wasn't set, we
493
493
        // wouldn't get this far.
494
494
        cfg := env.config.Config