lp:~wallyworld/juju-core/ssh-keys-plugin

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2013-12-02

Diff: 318 lines (+293/-0)

5 files modified

cmd/plugins/juju-authorized-keys/addkey.go (+54/-0)
cmd/plugins/juju-authorized-keys/authorizedkeys.go (+49/-0)
cmd/plugins/juju-authorized-keys/authorizedkeysplugin_test.go (+108/-0)
cmd/plugins/juju-authorized-keys/deletekey.go (+53/-0)
cmd/plugins/juju-authorized-keys/listkeys.go (+29/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2115. By Ian Booth on 2013-12-03

Merge trunk

2114. By Ian Booth on 2013-12-02

authorized keys plugin skeleton

2113. By Ian Booth on 2013-12-02

[r=wallyworld],[bug=1255006] Fix FileStorageReader path

If FileStorageReader is initialised with a
relative path, it needs to turn that into
an absolute path so that downstream things
like tools retrieval works.

https://codereview.appspot.com/35790043/

2112. By John A Meinel on 2013-11-29

[r=jameinel],[bug=1253633] cmd/juju/constraints.go: restore 1.16 compat

part of bug #1253633

Restore the ability to set/get environment constraints against a 1.16
server when Client.GetEnvironmentConstraints and
Client.SetEnvironmentConstraints were not implemented.
Same as the other implementations, try the API, if it fails fall back
to the old DB code. We don't have to fallback for the entire logic,
because only the Environment APIs weren't avaliable.

https://codereview.appspot.com/34730043/

2111. By John A Meinel on 2013-11-29

[r=jameinel],[bug=1253625] cmd/juju/environ.go: restore 1.16 compat

bug #1253625 is about "juju get-environment" and "juju
set-environment" not being compatible with a 1.16 API server because
Client.EnvironmentGet and Client.EnvironmentSet were not available.

So we fall back to direct DB access.

This replaces 'all' of SetEnvironment.Run because it has virtually no
other local logic. For GetEnvironment.Run we only replace the
EnvironmentGet step. (hence the different names for the functions.)

https://codereview.appspot.com/34750043/

2110. By John A Meinel on 2013-11-29

[r=jameinel],[bug=1253631] cmd/juju/addmachine.go: first part of compat

This handles the part of add-machine that doesn't involve manual
provisioning. It makes trunk compatible with 1.16.3 for a simple
"juju add-machine" or "juju add-machine lxc". The manual provisioning
case has a bunch more code, so that will be a followup patch.

https://codereview.appspot.com/34890044/

2109. By Ian Booth on 2013-11-29

[r=wallyworld],[bug=1254572] State server backup scripts

This branch provides a juju plugin to backup
critical files from the state server (machine 0).
The files are tarred up and copied to the local
machine used to invoke the backup.

https://codereview.appspot.com/31960043/

2108. By Ian Booth on 2013-11-29

[r=wallyworld] Use single watcher for containr setup

Add a WatchAllContainers API so that a single watcher
can be used to start (as needed) each container provisioner,
instead of using one eatcher per contsiner type.

This branch will need trunk merged and be updated to use the
revised SetSupportedContainers API call once my other branch
gets approved and landed.

https://codereview.appspot.com/28890043/

2107. By John A Meinel on 2013-11-28

[r=jameinel],[bug=1253639] cmd/juju/{ssh,debughooks}.go: restore 1.16 compat

This addresses bug #1253639. It makes it so that "juju ssh" "juju scp"
and "juju debug-hooks" are again compatible with 1.16.

I audited against a live 1.16.3 install that you can:
  juju ssh 0
  juju scp 0:/var/log/juju/machine-0.log .
  juju debug-hooks mysql/0
  juju debug-hooks mysql/0 master-relation-departed

All of which you couldn't do in trunk. (the actual ssh process was
switched to use Client.PublicAddress which affected everything, and
debug-hooks with a relation name used Client.ServiceCharmRelations.)

These aren't strictly just copying the code that was in 1.16 into trunk
and using it, because the broken step is in the middle of a multi-step process. (vs things like destroy-machine that is just a single API call that we do differently.)

The one "functional" change here is that if you run "juju debug-hooks
mysql/0 XXXX" with a relation hook that doesn't actually exist, it now
logs at INFO level the list of possible relation hooks. So you can see
the list with "--debug".

https://codereview.appspot.com/33860043/

2106. By Ian Booth on 2013-11-28

[r=jameinel] tweak: merge the 1.16 branch into trunk

The only thing this brings in is the update-bootstrap script which has landed in 1.16 and was already proposed for trunk.

https://codereview.appspot.com/32720046/