Merge lp://staging/~axwalk/juju-core/composeuserdata-customise-cloudinit into lp://staging/~go-bot/juju-core/trunk

Reviewers: mp+212092_code.launchpad.net,

Message:
Please take a look.

Description:
Update ComposeUserData to take cloudinit.Config

... and update provider/maas to use the apt
options instead of crafting apt-get commands.

Fixes lp:1295058

https://code.launchpad.net/~axwalk/juju-core/composeuserdata-customise-cloudinit/+merge/212092

(do not edit description out of merge proposal)

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

Affected files (+54, -70 lines):
   A [revision details]
   M environs/cloudinit.go
   M environs/cloudinit_test.go
   M provider/azure/customdata.go
   M provider/azure/customdata_test.go
   M provider/ec2/ec2.go
   M provider/maas/environ.go
   M provider/maas/environ_test.go
   M provider/maas/export_test.go
   M provider/openstack/provider.go
   M utils/apt.go
   M utils/apt_test.go

LGTM (assuming it has been run)

https://codereview.appspot.com/78640044/

On 2014/03/21 10:39:06, wwitzel3 wrote:
> LGTM (assuming it has been run)

Thanks. I haven't yet, but will before landing.

https://codereview.appspot.com/78640044/

On 2014/03/21 10:54:47, axw wrote:
> On 2014/03/21 10:39:06, wwitzel3 wrote:
> > LGTM (assuming it has been run)

> Thanks. I haven't yet, but will before landing.

Took a while, but I set up MAAS on KVM and verified this change works.

https://codereview.appspot.com/78640044/

Please take a look.

https://codereview.appspot.com/78640044/

LGTM

Just a random question about interfaces/duplication.

https://codereview.appspot.com/78640044/diff/20001/provider/openstack/provider.go
File provider/openstack/provider.go (right):

https://codereview.appspot.com/78640044/diff/20001/provider/openstack/provider.go#newcode527
provider/openstack/provider.go:527: func (e *environ)
SupportedArchitectures() ([]string, error) {
This seems identical to the code that is in the ec2 provider. Is that
just a product of using interfaces and there is no way around this
duplication? Will different providers do this differently maybe? ELI5

https://codereview.appspot.com/78640044/

BTW, if you go to the "unified diff" link the SupportedArchitecture
changes won't show up. They only show up in "delta from previous".

https://codereview.appspot.com/78640044/diff/20001/provider/openstack/provider.go
File provider/openstack/provider.go (right):

https://codereview.appspot.com/78640044/diff/20001/provider/openstack/provider.go#newcode527
provider/openstack/provider.go:527: func (e *environ)
SupportedArchitectures() ([]string, error) {
On 2014/03/26 11:15:29, wwitzel3 wrote:
> This seems identical to the code that is in the ec2 provider. Is that
just a
> product of using interfaces and there is no way around this
duplication? Will
> different providers do this differently maybe? ELI5

This change is just from merging trunk. I didn't implement it - this is
something wallyworld did recently.

Different providers do implement SupportedArchitectures differently. For
example the manual provider is a bit different (although possibly wrong;
I've emailed Ian to ask).

Having said that, it does look like there's a lot of duplication here
that could be factored out. I can't see any reason why it couldn't be
done, though wallyworld may well have a good explanation.

https://codereview.appspot.com/78640044/