juju-core

Merge lp://staging/~dave-cheney/juju-core/113-juju-bootstrap-raring-cloudinit-III into lp://staging/~juju/juju-core/trunk

113-juju-bootstrap-raring-cloudinit-III
Merge into trunk

Proposed by Dave Cheney on 2013-04-11

Status:	Merged
Approved by:	William Reade on 2013-04-11
Approved revision:	no longer in the source branch.
Merged at revision:	1143
Proposed branch:	lp://staging/~dave-cheney/juju-core/113-juju-bootstrap-raring-cloudinit-III
Merge into:	lp://staging/~juju/juju-core/trunk
Diff against target:	424 lines (+157/-125) 6 files modified environs/cloudinit/cloudinit.go (+12/-8) environs/cloudinit/cloudinit_test.go (+145/-56) environs/ec2/ec2.go (+0/-4) environs/mongo.go (+0/-37) environs/mongo_test.go (+0/-16) environs/openstack/provider.go (+0/-4)
To merge this branch:	bzr merge lp://staging/~dave-cheney/juju-core/113-juju-bootstrap-raring-cloudinit-III
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-04-11	Pending
Review via email: mp+158265@code.staging.launchpad.net

Description of the change

source mongo from package

This proposal replaces the source of mongo for state servers. Mongo is now
installed from a package. The source of this package differs depending on the
series of the machine being bootstrapped (which is itself drawn from the tools
installed on the machine). For P and Q, the source is a PPA owned by the Juju
team. For R and above, mongo is available in the archive.

https://codereview.appspot.com/8648043/

Revision history for this message

Roger Peppe (rogpeppe) wrote on 2013-04-11:

LGTM with one trivial

https://codereview.appspot.com/8648043/diff/1/environs/cloudinit/cloudinit_test.go
File environs/cloudinit/cloudinit_test.go (right):

https://codereview.appspot.com/8648043/diff/1/environs/cloudinit/cloudinit_test.go#newcode258
environs/cloudinit/cloudinit_test.go:258: source := struct{ Source, Key
string }{
honestly, i'd just bite it and define the type outside the function; or
just pass source and key as args.

if you do define it as a type, there's no need to export the fields,
AFAICS.

https://codereview.appspot.com/8648043/diff/1/environs/mongo.go
File environs/mongo.go (left):

https://codereview.appspot.com/8648043/diff/1/environs/mongo.go#oldcode12
environs/mongo.go:12: func MongoURL(env Environ, series, architecture
string) string {
yay!

https://codereview.appspot.com/8648043/

Revision history for this message

Dimiter Naydenov (dimitern) wrote on 2013-04-11:

LGTM, nice!

https://codereview.appspot.com/8648043/

Revision history for this message

William Reade (fwereade) wrote on 2013-04-11:

LGTM

https://codereview.appspot.com/8648043/diff/1/environs/mongo.go
File environs/mongo.go (left):

https://codereview.appspot.com/8648043/diff/1/environs/mongo.go#oldcode12
environs/mongo.go:12: func MongoURL(env Environ, series, architecture
string) string {
On 2013/04/11 06:05:59, rog wrote:
> yay!

wooooo!

https://codereview.appspot.com/8648043/