environs: drop InstanceIdAccessor hack

environs: drop InstanceIdAccessor hack

...and also ProviderType, which is already accessible in the environ config.

https://code.launchpad.net/~fwereade/juju-core/drop-instance-id-accessor/+merge/150796

(do not edit description out of merge proposal)

[fwereade, 2013-02-27 13:41:41]

Please take a look.

[rog, 2013-02-27 14:09:06]

LGTM assuming it works live under ec2 and openstack.

https://codereview.appspot.com/7375059/diff/1/cmd/jujud/bootstrap.go
File cmd/jujud/bootstrap.go (right):

https://codereview.appspot.com/7375059/diff/1/cmd/jujud/bootstrap.go#newcode67
cmd/jujud/bootstrap.go:67: // TODO: we need to be able to customize machine
jobs, not just hardcode these.
won't the bootstrap machine always need to run these jobs?
if we want the machine to run more jobs later, we can change its jobs (assuming
we implement that).

https://codereview.appspot.com/7375059/diff/1/environs/cloudinit/cloudinit.go
File environs/cloudinit/cloudinit.go (left):

https://codereview.appspot.com/7375059/diff/1/environs/cloudinit/cloudinit.go...
environs/cloudinit/cloudinit.go:45: ProviderType string
nice to see these go.

https://codereview.appspot.com/7375059/diff/1/environs/ec2/ec2.go
File environs/ec2/ec2.go (right):

https://codereview.appspot.com/7375059/diff/1/environs/ec2/ec2.go#newcode159
environs/ec2/ec2.go:159: str, err := fetchMetadata("instance-id")
this is great - it instantly gives us a bit more resilience to some of the
failed bootstrap problems, because fetchMetadata retries.

https://codereview.appspot.com/7375059/diff/1/environs/ec2/local_test.go
File environs/ec2/local_test.go (right):

https://codereview.appspot.com/7375059/diff/1/environs/ec2/local_test.go#newc...
environs/ec2/local_test.go:27: func (s *ProviderSuite) TestMetadata(c *C) {
nice to factor this out.

[dimitern, 2013-02-27 14:13:32]

Great! Thanks for that - so much redundant stuff will be gone!

LGTM indeed.

https://codereview.appspot.com/7375059/diff/1/environs/openstack/provider.go
File environs/openstack/provider.go (right):

https://codereview.appspot.com/7375059/diff/1/environs/openstack/provider.go#...
environs/openstack/provider.go:182: uri :=
fmt.Sprintf("%s/2012-08-10/meta-data.json", metadataHost)
This will only work on Folsom or later, so we need a better way to do it in the
future.

[fwereade, 2013-03-01 09:19:29]

*** Submitted:

environs: drop InstanceIdAccessor hack

...and also ProviderType, which is already accessible in the environ config.

R=rog, dimitern
CC=
https://codereview.appspot.com/7375059