Merge lp://staging/~dave-cheney/juju-core/113-juju-bootstrap-raring-cloudinit-II into lp://staging/~juju/juju-core/trunk
| Status: | Rejected |
|---|---|
| Rejected by: | Dave Cheney |
| Proposed branch: | lp://staging/~dave-cheney/juju-core/113-juju-bootstrap-raring-cloudinit-II |
| Merge into: | lp://staging/~juju/juju-core/trunk |
| Diff against target: |
454 lines (+158/-137) 6 files modified
environs/cloudinit/cloudinit.go (+12/-8) environs/cloudinit/cloudinit_test.go (+146/-57) environs/ec2/ec2.go (+0/-4) environs/mongo.go (+0/-48) environs/mongo_test.go (+0/-16) environs/openstack/provider.go (+0/-4) |
| To merge this branch: | bzr merge lp://staging/~dave-cheney/juju-core/113-juju-bootstrap-raring-cloudinit-II |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Description of the change
source mongo from package
This proposal replaces the source of mongo for state servers. Mongo is now installed from a package. The source of this package differs depending on the series of the machine being bootstrapped (which is itself drawn from the tools installed on the machine). For P and Q, the source is a PPA owned by the Juju team. For R and above, mongo is available in the archive.
Unmerged revisions
- 1130. By Dave Cheney
-
tweaks
- 1129. By Dave Cheney
-
gofmt
- 1128. By Dave Cheney
-
merge from trunk
- 1127. By Dave Cheney
-
re add mongo.go
- 1126. By Dave Cheney
-
wip
- 1125. By Dave Cheney
-
gofmt
- 1124. By Dave Cheney
-
remove MongoURL
- 1123. By Roger Peppe
-
state: use one schema for status
When implementing the allWatcher, it helps
to have a single doc type per collection.R=dimitern, fwereade
CC=
https://codereview. appspot. com/8510043 - 1122. By Frank Mueller
-
state: add environment persistency with UUID
Changed environment to be stored using an own document
in an own collection. Currently it only stores the name
and the UUID of the environment. The latter is generated
during the initializing of the state. Both, name and
UUID cannot be changed. The UUID will be passed as the
environment variable $JUJU_ENV_UUID to the charm hooks.R=fwereade, dimitern
CC=
https://codereview. appspot. com/8322043 - 1121. By Dimiter Naydenov
-
environs: add machineNonce to StartInstance()
Continuing from the previous CL, this propagates
the machine nonce throughout environs.Now the machineNonce is passed to StartInstance()
in all providers. In a follow-up the support for
handling nonces in state will be added.R=fwereade, rog, TheMue
CC=
https://codereview. appspot. com/8429044
