Merge lp:~axwalk/juju-core/null-provider-take3 into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Introduce the null provider

The null provider is a provider which
does, essentially, nothing. Instances
cannot be provisioned automatically;
they must be manually provisioned via
"add-machine ssh:...".

To bootstrap the environment, you name
the bootstrap node, which must be an
existing Ubuntu host, and it will be
"manually bootstrapped" via SSH. This
procedure is essentially the same as
manual provisioning.

Storage is managed by the bootstrap node.

TODO: storage is currently unauthenticated,
and the world can write to it. I will
address this next.

https://codereview.appspot.com/13255051/

Introduce the null provider

The null provider is a provider which
does, essentially, nothing. Instances
cannot be provisioned automatically;
they must be manually provisioned via
"add-machine ssh:...".

To bootstrap the environment, you name
the bootstrap node, which must be an
existing Ubuntu host, and it will be
"manually bootstrapped" via SSH. This
procedure is essentially the same as
manual provisioning.

Storage is managed by the bootstrap node.

TODO: storage is currently unauthenticated,
and the world can write to it. I will
address this next.

https://codereview.appspot.com/13255051/

[Andrew Wilkins (axwalk)]

Reviewers: mp+186954_code.launchpad.net,

Message:
Please take a look.

Description:
Introduce the null provider

The null provider is a provider which
does, essentially, nothing. Instances
cannot be provisioned automatically;
they must be manually provisioned via
"add-machine ssh:...".

To bootstrap the environment, you name
the bootstrap node, which must be an
existing Ubuntu host, and it will be
"manually bootstrapped" via SSH. This
procedure is essentially the same as
manual provisioning.

Storage is managed by the bootstrap node.

TODO: storage is currently unauthenticated,
and the world can write to it. I will
address this next.

https://code.launchpad.net/~axwalk/juju-core/null-provider-take3/+merge/186954

(do not edit description out of merge proposal)

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

Affected files (+677, -16 lines):
   A [revision details]
   M cmd/juju/bootstrap.go
   M cmd/jujud/machine.go
   M environs/cloudinit/cloudinit.go
   M environs/manual/agent.go
   M environs/manual/bootstrap.go
   M environs/sshstorage/storage.go
   M provider/all/all.go
   A provider/null/config.go
   A provider/null/config_test.go
   A provider/null/environ.go
   A provider/null/environ_test.go
   A provider/null/instance.go
   A provider/null/provider.go

[William Reade (fwereade)]

OK, I am torn. There's some really great stuff here, and then there are
some really evil bits that are completely my fault because I didn't put
my foot down last time and demand that the local provider not get
special treatment.

So, not your fault, but we need to figure out the right path forward.
There are a few different problems, all of which need to be addressed at
some stage:

1) Tools data sources for both these environments really should be done
properly, with simplestreams, and without abusing the upload-tools
pathway.

2) JobHostEnvironStorage ought to exist, be set by the *provider* by
configuring the cloud-init (or equivalent) such that jujud
bootstrap-state injects a machine with the right jobs and we can
eliminate the special-casing in jujud/machine.go

3) JobManageEnvironFirewall, done as above. Along with JHES above, we'll
have interesting problems to solve come HA time, but it's a step in a
sane direction.

...but it's plainly ridiculous to block this CL on implementing those
three things. So.

(1) Please talk to ian to figure out the state of play here; it may be
that upload-tools does everything nicely and simplestreamsily already,
in which case my only quibble is the special-casing by provider type in
juju/bootstrap and that's a tech-debt bug for another day.

(2) This can be landed as-is, but must be resolved quickly. Write a bug,
assign it to yourself, and queue it behind the storage authentication
work.

(3) Eh, it's a tech-debt bug if you just return nil from all the ports
methods. It will become much easier to fix once (2) is resolved, though,
because there'll be a custom-jobs pathway from the provider into state.

I'll try to be online tonight so we can chat live -- I think this is
very close to landing if we can agree on the issue and responses.

https://codereview.appspot.com/13255051/diff/1/cmd/juju/bootstrap.go
File cmd/juju/bootstrap.go (left):

https://codereview.appspot.com/13255051/diff/1/cmd/juju/bootstrap.go#oldcode90
cmd/juju/bootstrap.go:90: c.UploadTools = true
This bit stresses me out every time I see it, and ISTM that we're
expanding the hack rather than fixing it properly. Why can't the null
provider get its tools from simplestreams as usual, and allow the user
to specify a tools url explicitly for isolated environments, like
openstack does?

(for that matter, while this is not your problem specifically, why can't
the local provider itself know how to look for suitable tools locally,
and expose *that* as a data source for simplestreams?)

Ian, I'd appreciate your input here.

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

https://codereview.appspot.com/13255051/diff/1/cmd/juju/bootstrap.go#newcode92
cmd/juju/bootstrap.go:92: case provider.Local:
case provider.Null, provider.Local:
     ?

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go
File cmd/jujud/machine.go (left):

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go#oldcode240
cmd/jujud/machine.go:240: // the storage provider on one machine, and
that is the "bootstrap" node.
Oo, I don't like that comment. If we're going to be HA, storage is going
to ha...

[Andrew Wilkins (axwalk)]

https://codereview.appspot.com/13255051/diff/1/cmd/juju/bootstrap.go
File cmd/juju/bootstrap.go (left):

https://codereview.appspot.com/13255051/diff/1/cmd/juju/bootstrap.go#oldcode90
cmd/juju/bootstrap.go:90: c.UploadTools = true
On 2013/09/23 16:32:25, fwereade wrote:
> This bit stresses me out every time I see it, and ISTM that we're
expanding the
> hack rather than fixing it properly. Why can't the null provider get
its tools
> from simplestreams as usual, and allow the user to specify a tools url
> explicitly for isolated environments, like openstack does?

No good reason. I did it this way during development (I think there
might have been some breakage with simplestreams along the way), and
never updated to do it properly. This file can safely be reverted.

> (for that matter, while this is not your problem specifically, why
can't the
> local provider itself know how to look for suitable tools locally, and
expose
> *that* as a data source for simplestreams?)

> Ian, I'd appreciate your input here.

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

https://codereview.appspot.com/13255051/diff/1/cmd/juju/bootstrap.go#newcode92
cmd/juju/bootstrap.go:92: case provider.Local:
On 2013/09/23 16:32:25, fwereade wrote:
> case provider.Null, provider.Local:
> ?

Heh, yes. Excuse me while I take my C hat off.

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go
File cmd/jujud/machine.go (left):

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go#oldcode240
cmd/jujud/machine.go:240: // the storage provider on one machine, and
that is the "bootstrap" node.
On 2013/09/23 16:32:25, fwereade wrote:
> Oo, I don't like that comment. If we're going to be HA, storage is
going to have
> to be HA too. Not one for today though.

Is the null provider ever going to need to be HA? I thought this was
purely for "scale down", though I suppose we *might* want to support a
fully fledged scale-out environment, just without the automatic
provisioning.

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

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go#newcode241
cmd/jujud/machine.go:241: if (providerType == provider.Local ||
providerType == provider.Null) && m.Id() == bootstrapMachineId {
On 2013/09/23 16:32:25, fwereade wrote:
> This *really* should not be expressed like this. Special-casing one
provider
> type was a pretty bad layering violation, and two exceptions feel
uncomfortably
> like a trend.

> I think the only way we can reasonably do this is to tweak the
bootstrap
> pathways for the local and null providers, such that they inject an
additional
> machine job (say, JobHostEnvironStorage) on the bootstrap node.

That makes sense. There's a bunch of things to touch, so I have created:
https://bugs.launchpad.net/juju-core/+bug/1229507
and will follow up. If you prefer I do this now, though, I can.

https://codereview.appspot.com/13255051/diff/1/provider/null/config.go
File provider/null/config.go (right):

https://codereview.appspot.com/13255051/diff/1/provider/null/config.go#newcode23
provider/nul...

[Andrew Wilkins (axwalk)]

Please take a look.

https://codereview.appspot.com/13255051/

[William Reade (fwereade)]

We need to do more work wrt "shutting down" manually provisioned
instances -- ie removing juju therefrom -- but most of that I'm happy to
leave to a followup.

I'm not quite sure whether the complete non-functioning of Destroy is a
good thing or not. Given that destroying doesn't actually destroy
anything, maybe it's good that we don't trash storage either... but in
that case I think we should just return a not-implemented sort of error,
and keep going to provide a decent shutdown experience. Thoughts? Quick
discussion/confirmation here is the only thing delaying approval.

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go
File cmd/jujud/machine.go (left):

https://codereview.appspot.com/13255051/diff/1/cmd/jujud/machine.go#oldcode240
cmd/jujud/machine.go:240: // the storage provider on one machine, and
that is the "bootstrap" node.
On 2013/09/24 03:05:57, axw1 wrote:
> On 2013/09/23 16:32:25, fwereade wrote:
> > Oo, I don't like that comment. If we're going to be HA, storage is
going to
> have
> > to be HA too. Not one for today though.

> Is the null provider ever going to need to be HA? I thought this was
purely for
> "scale down", though I suppose we *might* want to support a fully
fledged
> scale-out environment, just without the automatic provisioning.

One day it will. Happy to defer consideration of that for now though.

https://codereview.appspot.com/13255051/diff/11001/cmd/jujud/machine.go
File cmd/jujud/machine.go (right):

https://codereview.appspot.com/13255051/diff/11001/cmd/jujud/machine.go#newcode259
cmd/jujud/machine.go:259: // are capable of managing ports at a global
level.
FWIW the firewaller handles instance-level provisioning too.

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ.go
File provider/null/environ.go (right):

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ.go#newcode76
provider/null/environ.go:76: func (e *nullEnviron) Bootstrap(_
constraints.Value, possibleTools tools.List, machineID string) error {
I really think we ought to drop machineID (which would be more
conventionally spelled machineId, I think) from Bootstrap, and the id
should always be "0". But that's not a job for today.

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ.go#newcode142
provider/null/environ.go:142: return fmt.Errorf("null provider cannot
destroy instances: %v", insts)
Is there *any* way to destroy an environment then? It's always got the
bootstrap machine in it, regardless of whether it's passed those
instances.

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ_test.go
File provider/null/environ_test.go (right):

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ_test.go#newcode72
provider/null/environ_test.go:72: c.Assert(s.env.Destroy(nil), gc.IsNil)
Yeah, it bothers me that this can complete without either errors or
impact. It's a deeper issue than can be managed in this CL, though -- it
kinda comes down to:

1) destroy-environment should probably involve setting every machine
except the manager to Dead (possibly breaking expectations in order to
do so -- eg killing them with active units in ...

[Andrew Wilkins (axwalk)]

https://codereview.appspot.com/13255051/diff/11001/cmd/jujud/machine.go
File cmd/jujud/machine.go (right):

https://codereview.appspot.com/13255051/diff/11001/cmd/jujud/machine.go#newcode259
cmd/jujud/machine.go:259: // are capable of managing ports at a global
level.
On 2013/09/26 08:03:41, fwereade wrote:
> FWIW the firewaller handles instance-level provisioning too.

Probably a better way of writing the comment would be "centrally",
rather than "at a global level".

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ_test.go
File provider/null/environ_test.go (right):

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ_test.go#newcode72
provider/null/environ_test.go:72: c.Assert(s.env.Destroy(nil), gc.IsNil)
On 2013/09/26 08:03:41, fwereade wrote:
> Yeah, it bothers me that this can complete without either errors or
impact. It's
> a deeper issue than can be managed in this CL, though -- it kinda
comes down to:

> 1) destroy-environment should probably involve setting every machine
except the
> manager to Dead (possibly breaking expectations in order to do so --
eg killing
> them with active units in play), allowing the provisioner to clean
them all up
> neatly, before setting the provisioner's own machine to Dead. Not
clear how much
> work this is in practice.

I wasn't really sure where to draw the line for null/manual. This sounds
reasonable, though. I think this shouldn't be *too* much work.

> 2) manually provisioned machine agents should be able to clean
themselves up
> completely once they've set themselves to Dead.

This still works, from the previous work on manual provisioning.

> Separately, remind me: what cleans up environment storage? That might
be our
> responsibility in this method.

Currently not done for the null-provider. I think the simplest thing to
do would be for the machine agent to remove its data-dir on
uninstallation (storage lives under there).

https://codereview.appspot.com/13255051/diff/11001/provider/null/instance.go
File provider/null/instance.go (right):

https://codereview.appspot.com/13255051/diff/11001/provider/null/instance.go#newcode41
provider/null/instance.go:41: // If the user specified bootsrap-host as
an IP address,
On 2013/09/26 08:03:41, fwereade wrote:
> s/bootsrap/bootstrap/

Thanks, will fix.

https://codereview.appspot.com/13255051/

[William Reade (fwereade)]

On 2013/09/26 08:23:00, axw1 wrote:
> > 1) destroy-environment should probably involve setting every machine
except
> the
> > manager to Dead (possibly breaking expectations in order to do so --
eg
> killing
> > them with active units in play), allowing the provisioner to clean
them all up
> > neatly, before setting the provisioner's own machine to Dead. Not
clear how
> much
> > work this is in practice.

> I wasn't really sure where to draw the line for null/manual. This
sounds
> reasonable, though. I think this shouldn't be *too* much work.

Excellent. You'll probably want a reasonably detailed chat with me about
state soon, then.

> > 2) manually provisioned machine agents should be able to clean
themselves up
> > completely once they've set themselves to Dead.

> This still works, from the previous work on manual provisioning.

Sweet! I couldn't remember if we'd done that.

> > Separately, remind me: what cleans up environment storage? That
might be our
> > responsibility in this method.

> Currently not done for the null-provider. I think the simplest thing
to do would
> be for the machine agent to remove its data-dir on uninstallation
(storage lives
> under there).

OK, that sounds pretty reasonable, but let's not set it in stone. We can
figure out what works best in the context of how we actually do it.

What do you think about returning an error from Destroy now, though? We
really don't have any sensible reason to claim the operation worked...

https://codereview.appspot.com/13255051/

[Andrew Wilkins (axwalk)]

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ.go
File provider/null/environ.go (right):

https://codereview.appspot.com/13255051/diff/11001/provider/null/environ.go#newcode142
provider/null/environ.go:142: return fmt.Errorf("null provider cannot
destroy instances: %v", insts)
On 2013/09/26 08:03:41, fwereade wrote:
> Is there *any* way to destroy an environment then? It's always got the
bootstrap
> machine in it, regardless of whether it's passed those instances.

No, not entirely at the moment. Agreed, this should return an error for
now while the rest is worked out. I will do that.

https://codereview.appspot.com/13255051/

[Andrew Wilkins (axwalk)]

Please take a look.

https://codereview.appspot.com/13255051/

[William Reade (fwereade)]

LGTM then, destroying properly can come in followups.

https://codereview.appspot.com/13255051/

[Go Bot (go-bot)]

The attempt to merge lp:~axwalk/juju-core/null-provider-take3 into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.743s
ok launchpad.net/juju-core/agent/tools 0.225s
ok launchpad.net/juju-core/bzr 6.571s
ok launchpad.net/juju-core/cert 3.240s
ok launchpad.net/juju-core/charm 0.546s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.025s
ok launchpad.net/juju-core/cmd 0.222s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
listing available tools
built 1.15.0.1-precise-amd64 (3244kB)
listing available tools
found 2 tools
listing target bucket
found 0 tools in target; 2 tools to be copied
copying 1.15.0.1-precise-amd64 from file:///tmp/419770343/tools/releases/juju-1.15.0.1-precise-amd64.tgz
copying tools/releases/juju-1.15.0.1-precise-amd64.tgz
downloaded tools/releases/juju-1.15.0.1-precise-amd64.tgz (3244kB), uploading
download 3244kB, uploading
copying 1.15.0.1-raring-amd64 from file:///tmp/419770343/tools/releases/juju-1.15.0.1-raring-amd64.tgz
copying tools/releases/juju-1.15.0.1-raring-amd64.tgz
downloaded tools/releases/juju-1.15.0.1-raring-amd64.tgz (3244kB), uploading
download 3244kB, uploading
copied 2 tools
generating tools metadata
tools metadata written

Juju cannot bootstrap because no tools are available for your environment.
An attempt was made to build and upload appropriate tools but this was unsuccessful.

listing available tools

Juju cannot bootstrap because no tools are available for your environment.
In addition, no tools could be located to upload.
You may want to use the 'tools-url' configuration setting to specify the tools location.

listing available tools
listing available tools

Juju cannot bootstrap because no tools are available for your environment.
In addition, no tools could be located to upload.
You may want to use the 'tools-url' configuration setting to specify the tools location.

listing available tools
found 4 tools
found 4 recent tools (version 1.2.0)
listing target bucket
found 0 tools in target; 4 tools to be copied
copying 1.2.0-precise-amd64 from http://127.0.0.1:37907/tools/juju-1.2.0-precise-amd64.tgz
copying tools/releases/juju-1.2.0-precise-amd64.tgz
downloaded tools/releases/juju-1.2.0-precise-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.2.0-quantal-amd64 from http://127.0.0.1:37907/tools/juju-1.2.0-quantal-amd64.tgz
copying tools/releases/juju-1.2.0-quantal-amd64.tgz
downloaded tools/releases/juju-1.2.0-quantal-amd64.tgz (0kB), uploading
download 0kB, uploading
copying 1.2.0-quantal-i386 from http://127.0.0.1:37907/tools/juju-1.2.0-quantal-i386.tgz
copying tools/releases/juju-1.2.0-quantal-i386.tgz
downloaded tools/releases/juju-1.2.0-quantal-i386.tgz (0kB), uploading
download 0kB, uploading
copying 1.2.0-raring-amd64 from http://127.0.0.1:37907/tools/juju-1.2.0-raring-amd64.tgz
copying tools/releases/juju-1.2.0-raring-amd64.tgz
downloaded tools/releases/juju-1.2.0-raring-amd64.tgz (0kB), uploading
download 0kB, uploading
copied 4 tools
generating...

=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go	2013-09-25 16:18:20 +0000
+++ cmd/jujud/machine.go	2013-09-26 11:22:31 +0000
@@ -246,8 +246,11 @@
 	// Take advantage of special knowledge here in that we will only ever want
 	// the storage provider on one machine, and that is the "bootstrap" node.
 	providerType := agentConfig.Value(agent.ProviderType)
-	if providerType == provider.Local && m.Id() == bootstrapMachineId {
+	if (providerType == provider.Local || providerType == provider.Null) && m.Id() == bootstrapMachineId {
 		runner.StartWorker("local-storage", func() (worker.Worker, error) {
+			// TODO(axw) 2013-09-24 bug #1229507
+			// Make another job to enable storage.
+			// There's nothing special about this.
 			return localstorage.NewWorker(agentConfig), nil
 		})
 	}
@@ -256,6 +259,9 @@
 		case state.JobHostUnits:
 			// Implemented in APIWorker.
 		case state.JobManageEnviron:
+			// TODO(axw) 2013-09-24 bug #1229506
+			// Make another job to enable the firewaller. Not all environments
+			// are capable of managing ports centrally.
 			runner.StartWorker("firewaller", func() (worker.Worker, error) {
 				return firewaller.NewFirewaller(st), nil
 			})

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-09-26 06:34:26 +0000
+++ environs/cloudinit/cloudinit.go	2013-09-26 11:22:31 +0000
@@ -8,6 +8,7 @@
 	"encoding/json"
 	"fmt"
 	"path"
+	"strings"
 
 	"launchpad.net/goyaml"
 
@@ -32,6 +33,9 @@
 // is bootstrapping.
 const BootstrapStateURLFile = "/tmp/provider-state-url"
 
+// fileSchemePrefix is the prefix for file:// URLs.
+const fileSchemePrefix = "file://"
+
 // MachineConfig represents initialization information for a new juju machine.
 type MachineConfig struct {
 	// StateServer specifies whether the new machine will run the
@@ -141,6 +145,12 @@
 
 	// Make a directory for the tools to live in, then fetch the
 	// tools and unarchive them into it.
+	var copyCmd string
+	if strings.HasPrefix(cfg.Tools.URL, fileSchemePrefix) {
+		copyCmd = fmt.Sprintf("cp %s $bin/tools.tar.gz", shquote(cfg.Tools.URL[len(fileSchemePrefix):]))
+	} else {
+		copyCmd = fmt.Sprintf("wget --no-verbose -O $bin/tools.tar.gz %s", shquote(cfg.Tools.URL))
+	}
 	toolsJson, err := json.Marshal(cfg.Tools)
 	if err != nil {
 		return nil, err
@@ -148,8 +158,8 @@
 	c.AddScripts(
 		"bin="+shquote(cfg.jujuTools()),
 		"mkdir -p $bin",
-		fmt.Sprintf("wget --no-verbose -O - %s | tee $bin/tools.tar.gz | sha256sum > $bin/juju%s.sha256",
-			shquote(cfg.Tools.URL), cfg.Tools.Version),
+		copyCmd,
+		fmt.Sprintf("sha256sum $bin/tools.tar.gz > $bin/juju%s.sha256", cfg.Tools.Version),
 		fmt.Sprintf(`grep '%s' $bin/juju%s.sha256 || (echo "Tools checksum mismatch"; exit 1)`,
 			cfg.Tools.SHA256, cfg.Tools.Version),
 		fmt.Sprintf("tar zxf $bin/tools.tar.gz -C $bin"),

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-09-26 06:34:26 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-09-26 11:22:31 +0000
@@ -84,7 +84,8 @@
 mkdir -p /var/log/juju
 bin='/var/lib/juju/tools/1\.2\.3-precise-amd64'
 mkdir -p \$bin
-wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-precise-amd64\.tgz' \| tee \$bin/tools\.tar\.gz \| sha256sum > \$bin/juju1\.2\.3-precise-amd64\.sha256
+wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/juju1\.2\.3-precise-amd64\.tgz'
+sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-precise-amd64\.sha256
 grep '1234' \$bin/juju1\.2\.3-precise-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\)
 tar zxf \$bin/tools.tar.gz -C \$bin
 rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-precise-amd64\.sha256
@@ -152,7 +153,8 @@
 mkdir -p /var/log/juju
 bin='/var/lib/juju/tools/1\.2\.3-raring-amd64'
 mkdir -p \$bin
-wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-raring-amd64\.tgz' \| tee \$bin/tools\.tar\.gz \| sha256sum > \$bin/juju1\.2\.3-raring-amd64\.sha256
+wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/juju1\.2\.3-raring-amd64\.tgz'
+sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-raring-amd64\.sha256
 grep '1234' \$bin/juju1\.2\.3-raring-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\)
 tar zxf \$bin/tools.tar.gz -C \$bin
 rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-raring-amd64\.sha256
@@ -214,7 +216,8 @@
 mkdir -p /var/log/juju
 bin='/var/lib/juju/tools/1\.2\.3-linux-amd64'
 mkdir -p \$bin
-wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-linux-amd64\.tgz' \| tee \$bin/tools\.tar\.gz \| sha256sum > \$bin/juju1\.2\.3-linux-amd64\.sha256
+wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/juju1\.2\.3-linux-amd64\.tgz'
+sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-linux-amd64\.sha256
 grep '1234' \$bin/juju1\.2\.3-linux-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\)
 tar zxf \$bin/tools.tar.gz -C \$bin
 rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-linux-amd64\.sha256
@@ -260,7 +263,8 @@
 mkdir -p /var/log/juju
 bin='/var/lib/juju/tools/1\.2\.3-linux-amd64'
 mkdir -p \$bin
-wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-linux-amd64\.tgz' \| tee \$bin/tools\.tar\.gz \| sha256sum > \$bin/juju1\.2\.3-linux-amd64\.sha256
+wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/juju1\.2\.3-linux-amd64\.tgz'
+sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-linux-amd64\.sha256
 grep '1234' \$bin/juju1\.2\.3-linux-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\)
 tar zxf \$bin/tools.tar.gz -C \$bin
 rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-linux-amd64\.sha256
@@ -277,6 +281,52 @@
 cat >> /etc/init/jujud-machine-2-lxc-1\.conf << 'EOF'\\ndescription "juju machine-2-lxc-1 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-2-lxc-1/jujud machine --data-dir '/var/lib/juju' --machine-id 2/lxc/1 --debug >> /var/log/juju/machine-2-lxc-1\.log 2>&1\\nEOF\\n
 start jujud-machine-2-lxc-1
 `,
+	}, {
+		cfg: cloudinit.MachineConfig{
+			MachineId:            "123",
+			MachineContainerType: "lxc",
+			AuthorizedKeys:       "sshkey1",
+			AgentEnvironment:     map[string]string{agent.ProviderType: "dummy"},
+			DataDir:              environs.DataDir,
+			Tools:                newFileTools("1.2.3-linux-amd64", "/var/lib/juju/storage/juju1.2.3-linux-amd64.tgz"),
+			MachineNonce:         "FAKE_NONCE",
+			StateInfo: &state.Info{
+				Addrs:    []string{"state-addr.testing.invalid:12345"},
+				Tag:      "machine-123",
+				Password: "arble",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+			APIInfo: &api.Info{
+				Addrs:    []string{"state-addr.testing.invalid:54321"},
+				Tag:      "machine-123",
+				Password: "bletch",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+		},
+		expectScripts: `
+set -xe
+mkdir -p /var/lib/juju
+mkdir -p /var/log/juju
+bin='/var/lib/juju/tools/1\.2\.3-linux-amd64'
+mkdir -p \$bin
+cp '/var/lib/juju/storage/juju1.2.3-linux-amd64\.tgz' \$bin/tools\.tar\.gz
+sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-linux-amd64\.sha256
+grep '1234' \$bin/juju1\.2\.3-linux-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\)
+tar zxf \$bin/tools.tar.gz -C \$bin
+rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-linux-amd64\.sha256
+printf %s '{"version":"1\.2\.3-linux-amd64","url":"file:///var/lib/juju/storage/juju1\.2\.3-linux-amd64\.tgz","sha256":"1234","size":10}' > \$bin/downloaded-tools\.txt
+install -m 600 /dev/null '/etc/rsyslog\.d/25-juju\.conf'
+printf '%s\\n' '\\n\$ModLoad imfile\\n\\n\$InputFileStateFile /var/spool/rsyslog/juju-machine-123-state\\n\$InputFilePersistStateInterval 50\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-123.log\\n\$InputFileTag juju-machine-123:\\n\$InputFileStateFile machine-123\\n\$InputRunFileMonitor\\n\\n:syslogtag, startswith, \"juju-\" @state-addr.testing.invalid:514\\n& ~\\n' > '/etc/rsyslog\.d/25-juju\.conf'
+restart rsyslog
+mkdir -p '/var/lib/juju/agents/machine-123'
+install -m 644 /dev/null '/var/lib/juju/agents/machine-123/format'
+printf '%s\\n' '.*' > '/var/lib/juju/agents/machine-123/format'
+install -m 600 /dev/null '/var/lib/juju/agents/machine-123/agent\.conf'
+printf '%s\\n' '.*' > '/var/lib/juju/agents/machine-123/agent\.conf'
+ln -s 1\.2\.3-linux-amd64 '/var/lib/juju/tools/machine-123'
+cat >> /etc/init/jujud-machine-123\.conf << 'EOF'\\ndescription "juju machine-123 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-123/jujud machine --data-dir '/var/lib/juju' --machine-id 123 --debug >> /var/log/juju/machine-123\.log 2>&1\\nEOF\\n
+start jujud-machine-123
+`,
 	},
 }
 
@@ -289,6 +339,12 @@
 	}
 }
 
+func newFileTools(vers, path string) *tools.Tools {
+	tools := newSimpleTools(vers)
+	tools.URL = "file://" + path
+	return tools
+}
+
 // check that any --env-config $base64 is valid and matches t.cfg.Config
 func checkEnvConfig(c *gc.C, cfg *config.Config, x map[interface{}]interface{}, scripts []string) {
 	re := regexp.MustCompile(`--env-config '([^']+)'`)

=== modified file 'environs/manual/agent.go'
--- environs/manual/agent.go	2013-09-16 04:55:45 +0000
+++ environs/manual/agent.go	2013-09-26 11:22:31 +0000
@@ -69,7 +69,7 @@
 	// we'll just generate a shell script.
 	var mcfg *cloudinit.MachineConfig
 	if args.bootstrap {
-		mcfg = environs.NewBootstrapMachineConfig(args.machineId, args.nonce)
+		mcfg = environs.NewBootstrapMachineConfig(args.machineId, args.stateFileURL)
 	} else {
 		mcfg = environs.NewMachineConfig(args.machineId, args.nonce, args.stateInfo, args.apiInfo)
 	}

=== modified file 'environs/manual/bootstrap.go'
--- environs/manual/bootstrap.go	2013-09-16 04:55:45 +0000
+++ environs/manual/bootstrap.go	2013-09-26 11:22:31 +0000
@@ -30,14 +30,12 @@
 
 type BootstrapArgs struct {
 	Host          string
+	DataDir       string
 	Environ       LocalStorageEnviron
 	MachineId     string
 	PossibleTools tools.List
 }
 
-// TODO(axw) make this configurable?
-const dataDir = "/var/lib/juju"
-
 func errMachineIdInvalid(machineId string) error {
 	return fmt.Errorf("%q is not a valid machine ID", machineId)
 }
@@ -52,6 +50,9 @@
 	if args.Environ == nil {
 		return errors.New("environ argument is nil")
 	}
+	if args.DataDir == "" {
+		return errors.New("data-dir argument is empty")
+	}
 	if !names.IsMachine(args.MachineId) {
 		return errMachineIdInvalid(args.MachineId)
 	}
@@ -103,6 +104,10 @@
 		}
 	}()
 
+	// Set the new tools prefix so StorageName returns the right thing.
+	restore := envtools.SetToolPrefix(envtools.NewToolPrefix)
+	defer restore()
+
 	// Get a file:// scheme tools URL for the tools, which will have been
 	// copied to the remote machine's storage directory.
 	tools := *possibleTools[0]
@@ -122,7 +127,7 @@
 	stateFileURL := fmt.Sprintf("file://%s/%s", storageDir, provider.StateFile)
 	err = provisionMachineAgent(provisionMachineAgentArgs{
 		host:          args.Host,
-		dataDir:       dataDir,
+		dataDir:       args.DataDir,
 		environConfig: args.Environ.Config(),
 		stateFileURL:  stateFileURL,
 		machineId:     args.MachineId,

=== modified file 'environs/manual/bootstrap_test.go'
--- environs/manual/bootstrap_test.go	2013-09-20 05:04:42 +0000
+++ environs/manual/bootstrap_test.go	2013-09-26 11:22:31 +0000
@@ -73,6 +73,7 @@
 	c.Assert(err, gc.IsNil)
 	return BootstrapArgs{
 		Host:          hostname,
+		DataDir:       "/var/lib/juju",
 		Environ:       s.env,
 		MachineId:     "0",
 		PossibleTools: toolsList,
@@ -122,6 +123,12 @@
 	c.Assert(err, jc.Satisfies, coreerrors.IsNotBootstrapped)
 }
 
+func (s *bootstrapSuite) TestBootstrapEmptyDataDir(c *gc.C) {
+	args := s.getArgs(c)
+	args.DataDir = ""
+	c.Assert(Bootstrap(args), gc.ErrorMatches, "data-dir argument is empty")
+}
+
 func (s *bootstrapSuite) TestBootstrapEmptyHost(c *gc.C) {
 	args := s.getArgs(c)
 	args.Host = ""

=== modified file 'provider/all/all.go'
--- provider/all/all.go	2013-08-19 13:29:56 +0000
+++ provider/all/all.go	2013-09-26 11:22:31 +0000
@@ -9,5 +9,6 @@
 	_ "launchpad.net/juju-core/provider/ec2"
 	_ "launchpad.net/juju-core/provider/local"
 	_ "launchpad.net/juju-core/provider/maas"
+	_ "launchpad.net/juju-core/provider/null"
 	_ "launchpad.net/juju-core/provider/openstack"
 )

=== added directory 'provider/null'
=== added file 'provider/null/config.go'
--- provider/null/config.go	1970-01-01 00:00:00 +0000
+++ provider/null/config.go	2013-09-26 11:22:31 +0000
@@ -0,0 +1,70 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package null
+
+import (
+	"fmt"
+
+	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/schema"
+)
+
+var (
+	configFields = schema.Fields{
+		"bootstrap-host":    schema.String(),
+		"bootstrap-user":    schema.String(),
+		"storage-listen-ip": schema.String(),
+		"storage-port":      schema.Int(),
+	}
+	configDefaults = schema.Defaults{
+		"bootstrap-user":    "",
+		"storage-listen-ip": "",
+		"storage-port":      8040,
+	}
+)
+
+type environConfig struct {
+	*config.Config
+	attrs map[string]interface{}
+}
+
+func newEnvironConfig(config *config.Config, attrs map[string]interface{}) *environConfig {
+	return &environConfig{Config: config, attrs: attrs}
+}
+
+func (c *environConfig) bootstrapHost() string {
+	return c.attrs["bootstrap-host"].(string)
+}
+
+func (c *environConfig) bootstrapUser() string {
+	return c.attrs["bootstrap-user"].(string)
+}
+
+func (c *environConfig) sshHost() string {
+	host := c.bootstrapHost()
+	if user := c.bootstrapUser(); user != "" {
+		host = user + "@" + host
+	}
+	return host
+}
+
+func (c *environConfig) storageListenIPAddress() string {
+	return c.attrs["storage-listen-ip"].(string)
+}
+
+func (c *environConfig) storagePort() int {
+	return int(c.attrs["storage-port"].(int64))
+}
+
+// storageAddr returns an address for connecting to the
+// bootstrap machine's localstorage.
+func (c *environConfig) storageAddr() string {
+	return fmt.Sprintf("%s:%d", c.bootstrapHost(), c.storagePort())
+}
+
+// storageListenAddr returns an address for the bootstrap
+// machine to listen on for its localstorage.
+func (c *environConfig) storageListenAddr() string {
+	return fmt.Sprintf("%s:%d", c.storageListenIPAddress(), c.storagePort())
+}

=== added file 'provider/null/config_test.go'
--- provider/null/config_test.go	1970-01-01 00:00:00 +0000
+++ provider/null/config_test.go	2013-09-26 11:22:31 +0000
@@ -0,0 +1,124 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package null
+
+import (
+	"fmt"
+	"regexp"
+	stdtesting "testing"
+
+	gc "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/provider"
+	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
+)
+
+type configSuite struct {
+	testbase.LoggingSuite
+}
+
+var _ = gc.Suite(&configSuite{})
+
+func Test(t *stdtesting.T) {
+	gc.TestingT(t)
+}
+
+func minimalConfigValues() map[string]interface{} {
+	return map[string]interface{}{
+		"name":           "test",
+		"type":           provider.Null,
+		"bootstrap-host": "hostname",
+		// While the ca-cert bits aren't entirely minimal, they avoid the need
+		// to set up a fake home.
+		"ca-cert":        coretesting.CACert,
+		"ca-private-key": coretesting.CAKey,
+	}
+}
+
+func minimalConfig(c *gc.C) *config.Config {
+	minimal := minimalConfigValues()
+	testConfig, err := config.New(config.UseDefaults, minimal)
+	c.Assert(err, gc.IsNil)
+	return testConfig
+}
+
+func getEnvironConfig(c *gc.C, attrs map[string]interface{}) *environConfig {
+	testConfig, err := config.New(config.UseDefaults, attrs)
+	c.Assert(err, gc.IsNil)
+	envConfig, err := nullProvider{}.validate(testConfig, nil)
+	c.Assert(err, gc.IsNil)
+	return envConfig
+}
+
+func (s *configSuite) TestValidateConfig(c *gc.C) {
+	testConfig := minimalConfig(c)
+	testConfig, err := testConfig.Apply(map[string]interface{}{"bootstrap-host": ""})
+	c.Assert(err, gc.IsNil)
+	_, err = nullProvider{}.Validate(testConfig, nil)
+	c.Assert(err, gc.ErrorMatches, "bootstrap-host must be specified")
+
+	testConfig = minimalConfig(c)
+	valid, err := nullProvider{}.Validate(testConfig, nil)
+	c.Assert(err, gc.IsNil)
+
+	unknownAttrs := valid.UnknownAttrs()
+	c.Assert(unknownAttrs["bootstrap-host"], gc.Equals, "hostname")
+	c.Assert(unknownAttrs["bootstrap-user"], gc.Equals, "")
+	c.Assert(unknownAttrs["storage-listen-ip"], gc.Equals, "")
+	c.Assert(unknownAttrs["storage-port"], gc.Equals, int64(8040))
+}
+
+func (s *configSuite) TestConfigMutability(c *gc.C) {
+	testConfig := minimalConfig(c)
+	valid, err := nullProvider{}.Validate(testConfig, nil)
+	c.Assert(err, gc.IsNil)
+	unknownAttrs := valid.UnknownAttrs()
+
+	// Make sure the immutable values can't be changed. It'd be nice to be
+	// able to change these, but that would involve somehow updating the
+	// machine agent's config/upstart config.
+	oldConfig := testConfig
+	for k, v := range map[string]interface{}{
+		"bootstrap-host":    "new-hostname",
+		"bootstrap-user":    "new-username",
+		"storage-listen-ip": "10.0.0.123",
+		"storage-port":      int64(1234),
+	} {
+		testConfig = minimalConfig(c)
+		testConfig, err = testConfig.Apply(map[string]interface{}{k: v})
+		c.Assert(err, gc.IsNil)
+		_, err := nullProvider{}.Validate(testConfig, oldConfig)
+		oldv := unknownAttrs[k]
+		errmsg := fmt.Sprintf("cannot change %s from %q to %q", k, oldv, v)
+		c.Assert(err, gc.ErrorMatches, regexp.QuoteMeta(errmsg))
+	}
+}
+
+func (s *configSuite) TestBootstrapHostUser(c *gc.C) {
+	values := minimalConfigValues()
+	testConfig := getEnvironConfig(c, values)
+	c.Assert(testConfig.bootstrapHost(), gc.Equals, "hostname")
+	c.Assert(testConfig.bootstrapUser(), gc.Equals, "")
+	c.Assert(testConfig.sshHost(), gc.Equals, "hostname")
+	values["bootstrap-host"] = "127.0.0.1"
+	values["bootstrap-user"] = "ubuntu"
+	testConfig = getEnvironConfig(c, values)
+	c.Assert(testConfig.bootstrapHost(), gc.Equals, "127.0.0.1")
+	c.Assert(testConfig.bootstrapUser(), gc.Equals, "ubuntu")
+	c.Assert(testConfig.sshHost(), gc.Equals, "ubuntu@127.0.0.1")
+}
+
+func (s *configSuite) TestStorageParams(c *gc.C) {
+	values := minimalConfigValues()
+	testConfig := getEnvironConfig(c, values)
+	c.Assert(testConfig.storageAddr(), gc.Equals, "hostname:8040")
+	c.Assert(testConfig.storageListenAddr(), gc.Equals, ":8040")
+	values["storage-listen-ip"] = "10.0.0.123"
+	values["storage-port"] = int64(1234)
+	testConfig = getEnvironConfig(c, values)
+	c.Assert(testConfig.storageAddr(), gc.Equals, "hostname:1234")
+	c.Assert(testConfig.storageListenAddr(), gc.Equals, "10.0.0.123:1234")
+}

=== added file 'provider/null/environ.go'
--- provider/null/environ.go	1970-01-01 00:00:00 +0000
+++ provider/null/environ.go	2013-09-26 11:22:31 +0000
@@ -0,0 +1,173 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package null
+
+import (
+	"errors"
+	"path"
+	"sync"
+
+	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/cloudinit"
+	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/httpstorage"
+	"launchpad.net/juju-core/environs/manual"
+	"launchpad.net/juju-core/environs/sshstorage"
+	"launchpad.net/juju-core/environs/storage"
+	"launchpad.net/juju-core/instance"
+	"launchpad.net/juju-core/provider"
+	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/tools"
+)
+
+const (
+	// TODO(axw) make this configurable?
+	dataDir = "/var/lib/juju"
+
+	// storageSubdir is the subdirectory of
+	// dataDir in which storage will be located.
+	storageSubdir = "storage"
+
+	// storageTmpSubdir is the subdirectory of
+	// dataDir in which temporary storage will
+	// be located.
+	storageTmpSubdir = "storage-tmp"
+)
+
+type nullEnviron struct {
+	cfg      *environConfig
+	cfgmutex sync.Mutex
+}
+
+var errNoStartInstance = errors.New("null provider cannot start instances")
+var errNoStopInstance = errors.New("null provider cannot stop instances")
+
+func (*nullEnviron) StartInstance(constraints.Value, tools.List, *cloudinit.MachineConfig) (instance.Instance, *instance.HardwareCharacteristics, error) {
+	return nil, nil, errNoStartInstance
+}
+
+func (*nullEnviron) StopInstances([]instance.Instance) error {
+	return errNoStopInstance
+}
+
+func (e *nullEnviron) AllInstances() ([]instance.Instance, error) {
+	return e.Instances([]instance.Id{manual.BootstrapInstanceId})
+}
+
+func (e *nullEnviron) envConfig() (cfg *environConfig) {
+	e.cfgmutex.Lock()
+	cfg = e.cfg
+	e.cfgmutex.Unlock()
+	return cfg
+}
+
+func (e *nullEnviron) Config() *config.Config {
+	return e.envConfig().Config
+}
+
+func (e *nullEnviron) Name() string {
+	return e.envConfig().Name()
+}
+
+func (e *nullEnviron) Bootstrap(_ constraints.Value, possibleTools tools.List, machineID string) error {
+	return manual.Bootstrap(manual.BootstrapArgs{
+		Host:          e.envConfig().sshHost(),
+		DataDir:       dataDir,
+		Environ:       e,
+		MachineId:     machineID,
+		PossibleTools: possibleTools,
+	})
+}
+
+func (e *nullEnviron) StateInfo() (*state.Info, *api.Info, error) {
+	return provider.StateInfo(e)
+}
+
+func (e *nullEnviron) SetConfig(cfg *config.Config) error {
+	e.cfgmutex.Lock()
+	defer e.cfgmutex.Unlock()
+	envConfig, err := nullProvider{}.validate(cfg, e.cfg.Config)
+	if err != nil {
+		return err
+	}
+	e.cfg = envConfig
+	return nil
+}
+
+// Implements environs.Environ.
+//
+// This method will only ever return an Instance for the Id
+// environ/manual.BootstrapInstanceId. If any others are
+// specified, then ErrPartialInstances or ErrNoInstances
+// will result.
+func (e *nullEnviron) Instances(ids []instance.Id) (instances []instance.Instance, err error) {
+	instances = make([]instance.Instance, len(ids))
+	var found bool
+	for i, id := range ids {
+		if id == manual.BootstrapInstanceId {
+			instances[i] = nullBootstrapInstance{e.envConfig().bootstrapHost()}
+			found = true
+		} else {
+			err = environs.ErrPartialInstances
+		}
+	}
+	if !found {
+		err = environs.ErrNoInstances
+	}
+	return instances, err
+}
+
+// Implements environs/bootstrap.BootstrapStorage.
+func (e *nullEnviron) BootstrapStorage() (storage.Storage, error) {
+	cfg := e.envConfig()
+	storageDir := e.StorageDir()
+	storageTmpdir := path.Join(dataDir, storageTmpSubdir)
+	return sshstorage.NewSSHStorage(cfg.sshHost(), storageDir, storageTmpdir)
+}
+
+func (e *nullEnviron) Storage() storage.Storage {
+	return httpstorage.Client(e.envConfig().storageAddr())
+}
+
+func (e *nullEnviron) PublicStorage() storage.StorageReader {
+	return environs.EmptyStorage
+}
+
+func (e *nullEnviron) Destroy() error {
+	return errors.New("null provider destruction is not implemented yet")
+}
+
+func (e *nullEnviron) OpenPorts(ports []instance.Port) error {
+	return nil
+}
+
+func (e *nullEnviron) ClosePorts(ports []instance.Port) error {
+	return nil
+}
+
+func (e *nullEnviron) Ports() ([]instance.Port, error) {
+	return []instance.Port{}, nil
+}
+
+func (*nullEnviron) Provider() environs.EnvironProvider {
+	return nullProvider{}
+}
+
+func (e *nullEnviron) StorageAddr() string {
+	return e.envConfig().storageListenAddr()
+}
+
+func (e *nullEnviron) StorageDir() string {
+	return path.Join(dataDir, storageSubdir)
+}
+
+func (e *nullEnviron) SharedStorageAddr() string {
+	return ""
+}
+
+func (e *nullEnviron) SharedStorageDir() string {
+	return ""
+}

=== added file 'provider/null/environ_test.go'
--- provider/null/environ_test.go	1970-01-01 00:00:00 +0000
+++ provider/null/environ_test.go	2013-09-26 11:22:31 +0000
@@ -0,0 +1,81 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package null
+
+import (
+	gc "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/manual"
+	"launchpad.net/juju-core/instance"
+)
+
+type environSuite struct {
+	env *nullEnviron
+}
+
+var _ = gc.Suite(&environSuite{})
+
+func (s *environSuite) SetUpTest(c *gc.C) {
+	envConfig := getEnvironConfig(c, minimalConfigValues())
+	s.env = &nullEnviron{cfg: envConfig}
+}
+
+func (s *environSuite) TestSetConfig(c *gc.C) {
+	err := s.env.SetConfig(minimalConfig(c))
+	c.Assert(err, gc.IsNil)
+
+	testConfig := minimalConfig(c)
+	testConfig, err = testConfig.Apply(map[string]interface{}{"bootstrap-host": ""})
+	c.Assert(err, gc.IsNil)
+	err = s.env.SetConfig(testConfig)
+	c.Assert(err, gc.ErrorMatches, "bootstrap-host must be specified")
+}
+
+func (s *environSuite) TestInstances(c *gc.C) {
+	var ids []instance.Id
+
+	instances, err := s.env.Instances(ids)
+	c.Assert(err, gc.Equals, environs.ErrNoInstances)
+	c.Assert(instances, gc.HasLen, 0)
+
+	ids = append(ids, manual.BootstrapInstanceId)
+	instances, err = s.env.Instances(ids)
+	c.Assert(err, gc.IsNil)
+	c.Assert(instances, gc.HasLen, 1)
+	c.Assert(instances[0], gc.NotNil)
+
+	ids = append(ids, manual.BootstrapInstanceId)
+	instances, err = s.env.Instances(ids)
+	c.Assert(err, gc.IsNil)
+	c.Assert(instances, gc.HasLen, 2)
+	c.Assert(instances[0], gc.NotNil)
+	c.Assert(instances[1], gc.NotNil)
+
+	ids = append(ids, instance.Id("invalid"))
+	instances, err = s.env.Instances(ids)
+	c.Assert(err, gc.Equals, environs.ErrPartialInstances)
+	c.Assert(instances, gc.HasLen, 3)
+	c.Assert(instances[0], gc.NotNil)
+	c.Assert(instances[1], gc.NotNil)
+	c.Assert(instances[2], gc.IsNil)
+
+	ids = []instance.Id{instance.Id("invalid")}
+	instances, err = s.env.Instances(ids)
+	c.Assert(err, gc.Equals, environs.ErrNoInstances)
+	c.Assert(instances, gc.HasLen, 1)
+	c.Assert(instances[0], gc.IsNil)
+}
+
+func (s *environSuite) TestDestroy(c *gc.C) {
+	c.Assert(s.env.Destroy(), gc.ErrorMatches, "null provider destruction is not implemented yet")
+}
+
+func (s *environSuite) TestLocalStorageConfig(c *gc.C) {
+	c.Assert(s.env.StorageDir(), gc.Equals, "/var/lib/juju/storage")
+	c.Assert(s.env.cfg.storageListenAddr(), gc.Equals, ":8040")
+	c.Assert(s.env.StorageAddr(), gc.Equals, s.env.cfg.storageListenAddr())
+	c.Assert(s.env.SharedStorageAddr(), gc.Equals, "")
+	c.Assert(s.env.SharedStorageDir(), gc.Equals, "")
+}

=== added file 'provider/null/instance.go'
--- provider/null/instance.go	1970-01-01 00:00:00 +0000
+++ provider/null/instance.go	2013-09-26 11:22:31 +0000
@@ -0,0 +1,68 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package null
+
+import (
+	"net"
+
+	"launchpad.net/juju-core/environs/manual"
+	"launchpad.net/juju-core/instance"
+)
+
+type nullBootstrapInstance struct {
+	host string
+}
+
+func (_ nullBootstrapInstance) Id() instance.Id {
+	// The only way to bootrap is via manual bootstrap.
+	return manual.BootstrapInstanceId
+}
+
+func (_ nullBootstrapInstance) Status() string {
+	return ""
+}
+
+func (inst nullBootstrapInstance) Addresses() (addresses []instance.Address, err error) {
+	host, err := inst.DNSName()
+	if err != nil {
+		return nil, err
+	}
+	addresses, err = instance.HostAddresses(host)
+	if err != nil {
+		return nil, err
+	}
+	// Add a HostName type address.
+	addresses = append(addresses, instance.NewAddress(host))
+	return addresses, nil
+}
+
+func (inst nullBootstrapInstance) DNSName() (string, error) {
+	// If the user specified bootstrap-host as an IP address,
+	// do a reverse lookup.
+	host := inst.host
+	if ip := net.ParseIP(host); ip != nil {
+		names, err := net.LookupAddr(ip.String())
+		if err != nil {
+			return "", err
+		}
+		host = names[0]
+	}
+	return host, nil
+}
+
+func (i nullBootstrapInstance) WaitDNSName() (string, error) {
+	return i.DNSName()
+}
+
+func (_ nullBootstrapInstance) OpenPorts(machineId string, ports []instance.Port) error {
+	return nil
+}
+
+func (_ nullBootstrapInstance) ClosePorts(machineId string, ports []instance.Port) error {
+	return nil
+}
+
+func (_ nullBootstrapInstance) Ports(machineId string) ([]instance.Port, error) {
+	return []instance.Port{}, nil
+}

=== added file 'provider/null/provider.go'
--- provider/null/provider.go	1970-01-01 00:00:00 +0000
+++ provider/null/provider.go	2013-09-26 11:22:31 +0000
@@ -0,0 +1,121 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package null
+
+import (
+	"errors"
+	"fmt"
+
+	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/provider"
+	"launchpad.net/juju-core/utils"
+)
+
+type nullProvider struct{}
+
+func init() {
+	environs.RegisterProvider(provider.Null, nullProvider{})
+}
+
+var errNoBootstrapHost = errors.New("bootstrap-host must be specified")
+
+func (p nullProvider) Prepare(cfg *config.Config) (environs.Environ, error) {
+	return p.Open(cfg)
+}
+
+func (p nullProvider) Open(cfg *config.Config) (environs.Environ, error) {
+	envConfig, err := p.validate(cfg, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &nullEnviron{cfg: envConfig}, nil
+}
+
+func checkImmutableString(cfg, old *environConfig, key string) error {
+	if old.attrs[key] != cfg.attrs[key] {
+		return fmt.Errorf("cannot change %s from %q to %q", key, old.attrs[key], cfg.attrs[key])
+	}
+	return nil
+}
+
+func (p nullProvider) validate(cfg, old *config.Config) (*environConfig, error) {
+	// Check for valid changes for the base config values.
+	if err := config.Validate(cfg, old); err != nil {
+		return nil, err
+	}
+	validated, err := cfg.ValidateUnknownAttrs(configFields, configDefaults)
+	if err != nil {
+		return nil, err
+	}
+	envConfig := newEnvironConfig(cfg, validated)
+	if envConfig.bootstrapHost() == "" {
+		return nil, errNoBootstrapHost
+	}
+	// Check various immutable attributes.
+	if old != nil {
+		oldEnvConfig, err := p.validate(old, nil)
+		if err != nil {
+			return nil, err
+		}
+		for _, key := range [...]string{
+			"bootstrap-user",
+			"bootstrap-host",
+			"storage-listen-ip",
+		} {
+			if err = checkImmutableString(envConfig, oldEnvConfig, key); err != nil {
+				return nil, err
+			}
+		}
+		oldPort, newPort := oldEnvConfig.storagePort(), envConfig.storagePort()
+		if oldPort != newPort {
+			return nil, fmt.Errorf("cannot change storage-port from %q to %q", oldPort, newPort)
+		}
+	}
+	return envConfig, nil
+}
+
+func (p nullProvider) Validate(cfg, old *config.Config) (valid *config.Config, err error) {
+	envConfig, err := p.validate(cfg, old)
+	if err != nil {
+		return nil, err
+	}
+	return cfg.Apply(envConfig.attrs)
+}
+
+func (_ nullProvider) BoilerplateConfig() string {
+	return `"null":
+        type: "null"
+        admin-secret: {{rand}}
+        ## set bootstrap-host to the host where the bootstrap machine agent
+        ## should be provisioned.
+        bootstrap-host:
+        ## set the login user to bootstrap the machine as. If left blank,
+        ## juju will connect to the bootstrap machine as the current user.
+        # bootstrap-user:
+        ## set the IP address for the bootstrap machine to listen on for
+        ## storage requests. If left blank, storage will be served on all
+        ## network interfaces.
+        # storage-listen-ip:
+        # storage-port: 8040
+
+`
+}
+
+func (_ nullProvider) SecretAttrs(cfg *config.Config) (map[string]string, error) {
+	return make(map[string]string), nil
+}
+
+func (_ nullProvider) PublicAddress() (string, error) {
+	// TODO(axw) 2013-09-10 bug #1222643
+	//
+	// eth0 may not be the desired interface for traffic to route
+	// through. We should somehow make this configurable, and
+	// possibly also record the IP resolved during manual bootstrap.
+	return utils.GetAddressForInterface("eth0")
+}
+
+func (p nullProvider) PrivateAddress() (string, error) {
+	return p.PublicAddress()
+}