lp:~axwalk/juju-core/remove-syslog-cloudinit-config

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~go-bot/juju-core/trunk at revision 2363

Juju Engineering: Pending requested 2014-02-26

Diff: 760 lines (+19/-191)

21 files modified

agent/agent.go (+0/-1)
cmd/jujud/machine.go (+0/-10)
container/testing/common.go (+0/-1)
environs/cloudinit.go (+0/-10)
environs/cloudinit/cloudinit.go (+0/-40)
environs/cloudinit/cloudinit_test.go (+0/-28)
environs/cloudinit_test.go (+0/-5)
provider/azure/customdata_test.go (+0/-2)
provider/local/environ.go (+0/-5)
state/address.go (+0/-2)
state/api/params/params.go (+0/-2)
state/api/provisioner/provisioner_test.go (+0/-1)
state/apiserver/deployer/deployer.go (+0/-1)
state/apiserver/provisioner/provisioner.go (+0/-1)
state/apiserver/provisioner/provisioner_test.go (+0/-1)
worker/deployer/export_test.go (+7/-9)
worker/deployer/simple.go (+0/-30)
worker/deployer/simple_test.go (+11/-38)
worker/provisioner/kvm-broker.go (+0/-1)
worker/provisioner/lxc-broker.go (+0/-1)
worker/provisioner/lxc-broker_test.go (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2356. By Andrew Wilkins on 2014-02-27

Merge trunk

2355. By Andrew Wilkins on 2014-02-27

Merge trunk

2354. By Andrew Wilkins on 2014-02-26

Remove all rsyslog configuration

This is a precursor to introducing a new
worker that manages rsyslog configuration.

We will end up with one place that creates
and upgrades rsyslog configuration based
on environment config changes, catering
both for machine and unit agents.

2353. By Andrew Wilkins on 2014-02-25

[r=axwalk] environs/config: fix optional values/defaults

We have config values which are optional for
backwards compatibility. In some cases these
should take on a different value to what the
default for a new config is. The way the defaults
map is currently constructed means that the
backwards-compatibility values always overwrite
the defaults.

https://codereview.appspot.com/66920043/

2352. By Nate Finch on 2014-02-24

[r=natefinch] Simpleworker implemention, a little worker for when you don't need anything fancy.

2351. By Dimiter Naydenov on 2014-02-24

[r=dimitern] cmd/juju: Improvements and minor fixes to ssh/scp

This CL mostly deals with suggestions from the last
review (https://codereview.appspot.com/66340045/),
which arrived after landing.

Summary of the changes:
 - scp using go.crypto has a better error message;
 - scp now accepts extra args last only, and no need for --;
 - scp works correctly with nodes that have public IPv6 address;
 - improved and rephrased help text for scp.

https://codereview.appspot.com/67820048/

R=natefinch

2350. By Martin Packman on 2014-02-24

[r=gz],[bug=1266734] Restore juju status compatibility with 1.16

A stub 'Status' api call was included in 1.16 though not used
in our codebase. It does break the fallback logic to switch
and operate on state directly when talking to a 1.16 state
server however. This branch reintroduces the old call with
the existing name, and uses 'FullStatus' for actual status
api.

https://codereview.appspot.com/66590043/

R=dimitern

2349. By Andrew Wilkins on 2014-02-24

[r=axwalk] cert: add serverAuth extKeyUsage to server certs

GnuTLS is particular about the key usage, which
prevents rsyslog from serving TLS unless the
correct ones are set.

This enables a fix for lp:1281071

https://codereview.appspot.com/66930043/

2348. By Dimiter Naydenov on 2014-02-22

[r=dimitern],[bug=1281577],[bug=1283412] cmd/juju: ssh/scp commands extra arguments; fixes

Removed the extraneous "--" that the ssh command
adds to the passed arguments, so any extra arguments
after the command will be forwarded to ssh properly.
It worked in 1.16, so this fixes a regression.
This fixes bug #1281577.

The scp command claims in its help that it supports
-- to pass extra arguments to scp, but it does not
and also does not support multiple local/remote
targets to be specified, as OpenSSH scp command does.
This fixes bug #1283412.

Also, improved a lot of ssh-related tests in both
utils/ssh/ and in cmd/juju/, adding new tests as
needed for the extra arguments.

Improved help texts for ssh, scp and add-machine
commands (included examples for the extra args
and multiple targets for scp, added ssh: example
for add-machine).

All changes are tested live:
 - bootstrapping on EC2 and running ssh or scp
 to test extra args and multiple targets;
 - manual bootstrapping
 - add-machine ssh:user@host to an existing env;
 - using juju on Windows, to test the embedded
 go.crypto ssh command.

https://codereview.appspot.com/66340045/

R=axwalk, gz

2347. By Nate Finch on 2014-02-21

[r=natefinch],[bug=1271937] use juju-mongod if it exists