lp:~rogpeppe/juju-core/438-local-instance-Addresses
- Get this branch:
- bzr branch lp:~rogpeppe/juju-core/438-local-instance-Addresses
Branch merges
- Juju Engineering: Pending requested
-
Diff: 21 lines (+9/-2)1 file modifiedprovider/local/instance.go (+9/-2)
Branch information
Recent revisions
- 1941. By Roger Peppe
-
[r=rogpeppe] environs/
sshstorage: join output with newlines Also a slight simplification - there's no
particular need for newLineWrapperWriter to
return an error, or for so many different
errors when writing to the command's stdin. - 1940. By Andrew Wilkins
-
[r=axwalk],[bug=1234125] provider/null: fix intermittent test failure
Also, in environs/sshstorage (related to test failure):
capture command output in case of outer ssh/bash command
failure.Fixes #1234125
- 1939. By Tim Penhey
-
[r=thumper],[bug=1228992] Fail earlier when bootstrapping if up already.
I broke apart the VerifyBootstrap method into two:
EnsureNotBootstrapped
VerifyStorage
Well I didn't create the second, just didn't call it
from the EnsureNotBootstrapped call. The ensure method is now called in the command bootstrap
prior to any upload tools checks.However the implication of this was much futher reaching
than I expected. Many tests assumed that bootstrap.Bootstrap
was enough to bootstrap and environment, and that it would
complain if already bootstrapped. Since the complaining was
moved into the command function, some changes had to be made.
Since some of the tests were refactored to check the storage,
this required making the dummy provider actually write the
provider-state into storage like a normal provider.I moved the VerifyStorage out of emptystorage.go and into open.go
as it seemed better fitting there (and the comment actually
makes sense now).Also used the environs constant for the VerificationFil
ename. - 1938. By Tim Penhey
-
[r=thumper],[bug=1216775] Allow the network-bridge to be configured.
Enable the local provider config to accept network-bridge.
This is then passed through to the container creation
network config.A slightly more informative message is added when the
bridge is not found. - 1935. By Roger Peppe
-
[r=rogpeppe] worker/
addressupdater: wire up It could do with some more comprehensive
testing, but it might be OK to land anyway. - 1934. By Roger Peppe
-
[r=fwereade] testing: try harder to reconnect in MgoReset
We were restarting the mongo server on almost
every test because the dummy provider sets the
admin password.This makes the situation better, although there
are probably places that use a different testing
admin secret still.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~go-bot/juju-core/trunk