lp://staging/~wallyworld/juju-core/authkeys-worker
- Get this branch:
- bzr branch lp://staging/~wallyworld/juju-core/authkeys-worker
Branch merges
Recent revisions
- 2118. By Tim Penhey
-
[r=thumper] Hook up the kvm broker and provisioner
This branch adds a kvm broker and hooks it up to the
existing container initialization.The cpu-checker package is added to every machine to
allow kvm-ok to be executed.A few drive by fixes related to kvm:
* added a default bridge, used by the broker when
there is no other config.
* the container wasn't removing the container dir
* the kvm package isn't actually needed
* the local provider was setting the wrong container
type (in the case of kvm) - 2117. By Roger Peppe
-
[r=rogpeppe] state: refactor addmachine.go
The current code had become a twisty maze. This
change is intended to make things somewhat more
straightforward.The key insight is that there are only four
pathways through the code that require
different control flow:- adding a top level machine
- adding a top level machine with associated instance id
- adding a machine within an existing machine
- adding a machine within a newly created machineEach of these pathways now has its own function.
One pathway was catered for by the old code
but is not by the new: adding a machine within
a machine with associated instance id.
I don't believe that's a case we need to be
bothered about (and it's easy to add if we are).For the time being, I have kept the external interface
identical, but I'd like to change it to be a little
more like the above set of functions, rather
than having a single set of AddMachineParams
suitable for every case. - 2116. By Andrew Wilkins
-
[r=axwalk] Implement synchronous bootstrap
environs/manual has been further refactored to
split the "manual cloud-init over SSH" out into
a separate package (cloudinit/sshinit) . provider/common now starts an instance with the
basic cloud-init only (SSH keys + logging), then
waits for a DNS name, waits to be able to connect
via SSH, and then defers to sshinit to execute the
remaining cloud-init steps.If the user hits Ctrl-C, SIGINT will terminate
the SSH connection, and the bootstrap process will
attempt to clean up by stopping the instance and
removing the state file (if the instance could be
cleanly stopped). We also ignore SIGINT in the
juju process so a second Ctrl-C will not terminate
the cleanup procedure.Fixes #1224230
- 2115. By Tim Penhey
-
[r=thumper] Allow the local provider to use kvm.
Add a 'container' config value for the local provider.
The allows a local provider to use kvm instead of lxc
if the host machine is kvm capable.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~go-bot/juju-core/trunk