Merge lp://staging/~fwereade/juju-core/bootstrap-constraints-3 into lp://staging/~juju/juju-core/trunk
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~fwereade/juju-core/bootstrap-constraints-3 |
| Merge into: | lp://staging/~juju/juju-core/trunk |
| Prerequisite: | lp://staging/~fwereade/juju-core/bootstrap-constraints-2 |
| Diff against target: |
1212 lines (+808/-156) 11 files modified
environs/dummy/environs.go (+2/-2) environs/ec2/ec2.go (+11/-8) environs/ec2/export_test.go (+16/-0) environs/ec2/image.go (+88/-32) environs/ec2/image_test.go (+138/-103) environs/ec2/instancetype.go (+368/-0) environs/ec2/instancetype_test.go (+174/-0) environs/ec2/local_test.go (+6/-0) environs/ec2/suite_test.go (+0/-5) environs/jujutest/livetests.go (+3/-4) environs/openstack/provider.go (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~fwereade/juju-core/bootstrap-constraints-3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Description of the change
environs/ec2: apply bootstrap constraints
We don't yet pass them through the cloudinit, so they're not yet used to set
the initial environment constraints, but we do apply them to the bootstrap
node. That'll come in a followup, applied to both ec2 and cloudinit; after
that, blue should become unblocked on implementing constraints support in
openstack.
Unmerged revisions
- 1012. By William Reade
-
more realistic test costs
- 1011. By William Reade
-
instance type tests
- 1010. By William Reade
-
some tests working
- 1009. By William Reade
-
filled in instance type info
- 1008. By William Reade
-
untested but manually verified sketch of applying constraints to bootstrap node
- 1007. By William Reade
-
bootstrap constraints are now passed from BootstrapCommand into environs
- 1006. By William Reade
-
jujud bootstrap now accepts --constraints
- 1005. By Dave Cheney
-
cmd/juju: add shared juju version command
In Juju charm testing it would be great if we could tell the version of juju we are using. The version command was only available on jujud, so I have moved it into a shared location and added it juju as well.
R=thumper, dimitern
CC=
https://codereview. appspot. com/7794045 - 1004. By Ian Booth
-
Make tests pass on raring
Raring ships with a later version of git (1.8.x).
This newer version requires user and email to be
known before committing and on some raring setups,
the info could not be found. So I added a test
fixture to ensure the info was available when the
tests are run.R=dfc, thumper
CC=
https://codereview. appspot. com/7677044 - 1003. By Tim Penhey
-
Add a --format flag for jujuc commands missing it
Fixes lp:1129130. Also marks the --format flag as deprecated for commands
that don't produce output.R=dfc, dimitern
CC=
https://codereview. appspot. com/7795045
