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

« back to all changes in this revision

Viewing changes to environs/cloudinit.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

files added:
utils/password_test.go

files modified:
agent/bootstrap.go

agent/bootstrap_test.go

cmd/juju/environment.go

cmd/juju/set.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine_test.go

cmd/jujud/unit_test.go

environs/cloudinit.go

environs/cloudinit_test.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/conn_test.go

juju/export_test.go

juju/testing/conn.go

provider/dummy/environs.go

provider/local/environ.go

provider/local/environprovider.go

provider/local/export_test.go

provider/local/local_test.go

state/api/agent/machine_test.go

state/api/agent/unit_test.go

state/api/client.go

state/api/deployer/deployer_test.go

state/api/params/params.go

state/api/provisioner/provisioner_test.go

state/api/uniter/state_test.go

state/api/uniter/uniter_test.go

state/apiserver/agent/agent_test.go

state/apiserver/client/api_test.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/client/perm_test.go

state/apiserver/common/addresses.go

state/apiserver/common/addresses_test.go

state/apiserver/deployer/deployer.go

state/apiserver/deployer/deployer_test.go

state/apiserver/logger/logger_test.go

state/apiserver/login_test.go

state/apiserver/machine/agent_test.go

state/apiserver/provisioner/provisioner.go

state/apiserver/provisioner/provisioner_test.go

state/apiserver/server_test.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/apiserver/upgrader/upgrader_test.go

state/apiserver/utils.go

state/export_test.go

state/machine.go

state/machine_test.go

state/state_test.go

state/unit.go

state/unit_test.go

state/user.go

state/user_test.go

testing/mgo.go

utils/password.go

utils/trivial_test.go

worker/provisioner/provisioner_test.go

worker/uniter/charm/charm_test.go

worker/uniter/context_test.go

worker/uniter/filter_test.go

worker/uniter/relationer_test.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

environs/cloudinit.go

102

if password == "" {

103

return fmt.Errorf("environment configuration has no admin-secret")

104

}

105

passwordHash := utils.PasswordHash(password)

105

passwordHash := utils.UserPasswordHash(password, utils.CompatSalt)

106

mcfg.APIInfo = &api.Info{Password: passwordHash, CACert: caCert}

107

mcfg.StateInfo = &state.Info{Password: passwordHash, CACert: caCert}

108

mcfg.StatePort = cfg.StatePort()

Older »