lp:~axwalk/juju-core/wire-up-prechecker
- Get this branch:
- bzr branch lp:~axwalk/juju-core/wire-up-prechecker
Branch merges
- Juju Engineering: Pending requested
-
Diff: 768 lines (+351/-69) (has conflicts)20 files modifiedcmd/jujud/agent.go (+9/-0)
cmd/jujud/machine.go (+13/-0)
environs/base.go (+22/-0)
environs/interface.go (+5/-22)
environs/jujutest/livetests.go (+4/-9)
juju/conn.go (+28/-11)
juju/conn_test.go (+36/-0)
provider/azure/environ.go (+2/-2)
provider/dummy/environs.go (+2/-0)
provider/ec2/ec2.go (+2/-2)
provider/ec2/local_test.go (+2/-4)
provider/local/environ.go (+27/-1)
provider/local/environ_test.go (+2/-5)
provider/maas/environ.go (+2/-0)
provider/null/environ.go (+12/-0)
provider/openstack/local_test.go (+2/-4)
provider/openstack/provider.go (+2/-2)
state/open.go (+2/-2)
state/state.go (+57/-5)
state/state_test.go (+120/-0)
Branch information
Recent revisions
- 1904. By Andrew Wilkins
-
Address review comments
- Remove unnecessary admin-secret/
ca-private- key copy.
- Log/add bug number to TODO in cmd/jujud. - 1903. By Andrew Wilkins
-
Address review comments
Change juju.NewConn to always return a fresh Environ,
and use that as the Prechecker. - 1902. By Andrew Wilkins
-
juju: update Conn.Environ in NewConn
Always return a fresh, up-to-date Environ.
- 1901. By Andrew Wilkins
-
juju.NewConn: call SetPrechecker
But do it with an Environ whose
config was loaded from state. - 1900. By Andrew Wilkins
-
Address review comments
- Add Prechecker into environs.Environ,
introduce NilPrechecker for embedding
- Remove SetPrechecker from juju.NewConn
- Don't precheck instances for injected machines
- Don't set prechecker to nil for manual provisioning
- Learn to use mutexes properly ;) - 1899. By Andrew Wilkins
-
Address review comments
- Move Prechecker from environs to state.
- Add "var _" assertions for Prechecker implementation.
- Acquire Mutex in SetPrechecker.
- Move Environ loaded from state into StateWorker in cmd/jujud. - 1897. By Tim Penhey
-
[r=thumper] Tweak internal logging
These are logging changes that happened while debugging
a schema validation failure. Worth keeping IMO. - 1896. By Ian Booth
-
[r=wallyworld] Fix tools sources for local and azure
The local provider did not implement CustomToolsSources,
so when it tried to get tools via simplestreams, it
failed and then used the legacy fallback. But this meant
that checksum and size info was missing.The azure provider did implement CustomToolsSources, but
until the official tools repository comes online, the
tools sources do need to include the public container
from which tools can be fetched, or else simplestreams
will fail and revert to legacy tools code. - 1895. By Tim Penhey
-
[r=wallyworld],[bug=1231543] Fix local provider bootstrap.
The environment configuration was being serialized
through JSON, which was coercing the integer values
to float64.The validation schema checks were strictly looking for
integers. This has now been changed to ForceInt.Test added.
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