Merge lp:~thumper/juju-core/fix-local-bootstrap into lp:juju-core/1.16

[Tim Penhey]

Fix local provider bootstrap.

The bootstrap storage was not set up for the local
provider.

https://codereview.appspot.com/14439067/

Fix local provider bootstrap.

The bootstrap storage was not set up for the local
provider.

https://codereview.appspot.com/14439067/

[Tim Penhey (thumper)]

Reviewers: mp+191522_code.launchpad.net,

Message:
Please take a look.

Description:
Fix local provider bootstrap.

The bootstrap storage was not set up for the local
provider.

https://code.launchpad.net/~thumper/juju-core/fix-local-bootstrap/+merge/191522

(do not edit description out of merge proposal)

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

Affected files (+7, -0 lines):
   A [revision details]
   M provider/local/environ.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131010031125-8lgphpzdl93berr7
+New revision: <email address hidden>

Index: provider/local/environ.go
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go 2013-10-04 08:45:50 +0000
+++ provider/local/environ.go 2013-10-16 21:28:54 +0000
@@ -335,6 +335,11 @@
   return httpstorage.Client(env.config.sharedStorageAddr())
  }

+// Implements environs.BootstrapStorager.
+func (env *localEnviron) EnableBootstrapStorage() error {
+ return env.setupLocalStorage()
+}
+
  // Destroy is specified in the Environ interface.
  func (env *localEnviron) Destroy() error {
   if !env.config.runningAsRoot {

[Tim Penhey (thumper)]

On 2013/10/16 22:31:25, thumper wrote:
> Please take a look.

LGTM - just backporting fix to 1.16

https://codereview.appspot.com/14439067/

[Tim Penhey (thumper)]

Self approving the backport of the fix to 1.16

review: Approve

[Sidnei da Silva (sidnei)]

On 2013/10/16 22:36:52, thumper wrote:
> On 2013/10/16 22:31:25, thumper wrote:
> > Please take a look.

> LGTM - just backporting fix to 1.16

LGTM.

https://codereview.appspot.com/14439067/

[Sidnei da Silva (sidnei)]

https://codereview.appspot.com/14439067/

=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2013-10-04 08:45:50 +0000
+++ provider/local/environ.go	2013-10-16 22:29:44 +0000
@@ -335,6 +335,11 @@
 	return httpstorage.Client(env.config.sharedStorageAddr())
 }
 
+// Implements environs.BootstrapStorager.
+func (env *localEnviron) EnableBootstrapStorage() error {
+	return env.setupLocalStorage()
+}
+
 // Destroy is specified in the Environ interface.
 func (env *localEnviron) Destroy() error {
 	if !env.config.runningAsRoot {