Created by Matthew Williams and last modified
Get this branch:
bzr branch lp:~mattyw/juju-core/add-service-owner-to-status
Only Matthew Williams can upload to this branch. If you are Matthew Williams please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Matthew Williams

Recent revisions

2351. By Matthew Williams

merged with trunk

2350. By Matthew Williams

merged with trunk

2349. By Matthew Williams

added owner tag to status, fixed tests, fixed a wrong import for loggo

2348. By Dimiter Naydenov

[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.


R=axwalk, gz

2347. By Nate Finch

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

2346. By Curtis Hovey

[r=sinzui] Increment version to 1.17.4

Update juju-core version and win installer to 1.17.4.


2345. By Dimiter Naydenov

[r=dimitern],[bug=1282553] cloudinit: Use curl instead of wget. Fix #1282553

As mentoned in the bug, wget on precise does not
support SNI an cURL does, so this changes cloudinit
to install curl and use it instead of wget to fetch
the tools from streams.canonical.com on bootstrap.

Live tested on EC2 and MAAS.



2344. By Andrew Wilkins

[r=axwalk] Wire up prechecker

We introduce the concept of a policy
into state: state.State is given a
state.Policy interface when opened,
which is consulted during certain
operations to validate or modify

The Policy interface contains only
one method, Prechecker, which is called
to obtain a Prechecker. The Prechecker,
if non-nil, is used to ensure that an
instance with the specified parameters
can potentially be instantiated.

There is currently only one implementation
of Prechecker, and that is the manual
provider's Environ. The manual provider
thus prevents add-machine without ssh-


2343. By Ian Booth

[r=wallyworld],[bug=1282224] Unit upgrader data dir fix

The unit upgrader was using the default datadir instead
of the one configured in the agent config.


2342. By Andrew Wilkins

[r=axwalk],[bug=1282235] environs/manual: use file:// if tools on machine

We previously set the tools URL to file://, assuming
they would always be available on the target machine
by uploading them. This is not necessarily the case,
as tools may now be located on streams.canonical.com.

The bug is fixed by first checking that the tools URL
originates in the environment storage, and if so sets
the URL to file://...

Fixes lp:1282235


Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.