~dave-cheney/juju-core/057-environs-config-default-series-tests

Viewing changes to environs/dummy/environs.go

Committer: Roger Peppe
Date: 2012-11-26 16:38:18 UTC
mfrom: (735.1.12 163-bootstrap-cert-and-key)
Revision ID: roger.peppe@canonical.com-20121126163818-wqolbjf3s8e0q33o

environs: split bootstrap certificate/key

It's more consistent with the way we treat cert/key
pairs elsewhere.

R=gz, john.meinel, TheMue
CC=
https://codereview.appspot.com/6782103

files modified:
cmd/juju/bootstrap.go

environs/bootstrap.go

environs/bootstrap_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/config/config_test.go

environs/dummy/environs.go

environs/ec2/ec2.go

environs/interface.go

environs/open_test.go

environs/openstack/provider.go

Show diffs side-by-side

added added

removed removed

environs/dummy/environs.go

376

return e.state.name

377

}

378

379

func (e *environ) Bootstrap(uploadTools bool, certAndKey []byte) error {

379

func (e *environ) Bootstrap(uploadTools bool, cert, key []byte) error {

380

defer delay()

381

if err := e.checkBroken("Bootstrap"); err != nil {

382

return err

Older »