Merge lp:~thumper/juju-core/fix-local-bootstrap-again into lp:~go-bot/juju-core/trunk
Proposed by
Tim Penhey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Tim Penhey | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1992 | ||||
Proposed branch: | lp:~thumper/juju-core/fix-local-bootstrap-again | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
15 lines (+5/-0) 1 file modified
provider/local/environ.go (+5/-0) |
||||
To merge this branch: | bzr merge lp:~thumper/juju-core/fix-local-bootstrap-again | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+191511@code.launchpad.net |
Commit message
Fix local provider bootstrap.
The bootstrap storage was not set up for the local
provider.
Description of the change
Fix local provider bootstrap.
The bootstrap storage was not set up for the local
provider.
To post a comment you must log in.
Reviewers: mp+191511_ 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/ 191511
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/14573046/
Affected files (+7, -0 lines): local/environ. go
A [revision details]
M provider/
Index: [revision details] 20131010031125- 8lgphpzdl93berr 7
=== 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-
+New revision: <email address hidden>
Index: provider/ local/environ. go local/environ. go' local/environ. go 2013-10-04 08:45:50 +0000 local/environ. go 2013-10-16 21:28:54 +0000 Client( env.config. sharedStorageAd dr())
=== modified file 'provider/
--- provider/
+++ provider/
@@ -335,6 +335,11 @@
return httpstorage.
}
+// Implements environs. BootstrapStorag er. Storage( ) error { torage( ) runningAsRoot {
+func (env *localEnviron) EnableBootstrap
+ return env.setupLocalS
+}
+
// Destroy is specified in the Environ interface.
func (env *localEnviron) Destroy() error {
if !env.config.