Created by Dave Cheney on 2014-02-11 and last modified on 2014-02-12
Get this branch:
bzr branch lp:~dave-cheney/juju-core/167-simplestreams-add-trusty
Only Dave Cheney can upload to this branch. If you are Dave Cheney please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Dave Cheney

Recent revisions

2310. By Dave Cheney on 2014-02-11

Add trusty support for simple streams

Also, move the list of expected series to a constant in juju-core/testing

2309. By Roger Peppe on 2014-02-10

[r=rogpeppe] state: fix i/o timeout errors

Since mongo has been fixed to time out sockets,
(in revision 241 of mgo)
the state package was failing quite a lot.
This should make it more robust.
In particular, we use the Timeout field on
mgo.DialInfo to signify the amount of time
we are prepared to wait before connection,
not the amount of time to wait for a response,
so this change makes the latter independent
of the former.


2308. By Andrew Wilkins on 2014-02-10

[r=axwalk] provider/manual: set storage in SetConfig

We currently rely on EnableBootstrapStorage to
specify the storage mechanism to use for bootstrap
and sync-tools. This is insufficient in practice,
causing panics such as those in lp:1262764.

Instead, we inject a boolean attribute into the
environment config that is stored in state; this
attribute is false in the .jenv file, and true
in state. We use its value to decide whether to
use sshstorage (external) or httpstorage (internal).

A followup will eliminate BootstrapStorager.

Fixes lp:1262764


2307. By Andrew Wilkins on 2014-02-10

[r=axwalk],[bug=1275806] environs: deduplicate boilerplate config

Provider aliases (of which there is one: null->manual)
cause duplicated boilerplate config. We now remember
which boilerplate config templates have been seen, and

Drive by addition of test to provider/manual for alias.

Fixes lp:1275806


2306. By Abel Deuring on 2014-02-10

[r=natefinch][bug=1246938] "juju ssh" and "suhu run": Return the exit code from the remote process as juju's exit code.

2305. By Andrew Wilkins on 2014-02-10

[r=axwalk],[bug=1273933] Make bootstrap machine jobs configurable

This addresses a long-standing TODO in
cmd/jujud to making bootstrap machine
jobs configurable. If agent.BootstrapJobs
is present in the agent configuration
key/value map, it will be used instead
of the defaults (the existing hard-coded

The local provider is updated to set
agent.BootstrapJobs to be {JobManageEnviron}.

Fixes lp:1273933


2304. By Andrew Wilkins on 2014-02-10

[r=axwalk] utils/ssh: only use existing default identities

"juju ssh" and bootstrap and so on are emitting
warnings from ssh if any of the default identities
don't exist. This is fixed by only specifying the
default identities that exist.


2303. By John A Meinel on 2014-02-06

[r=jameinel] state/apiserver: tag() for disconnect

We put tag() everywhere that we can, so that it is easy to see who is making a
particular request. It is also useful to see this in the disconnect case. (eg,
it makes it clear that user-admin is disconnecting, and not a particular


2302. By Roger Peppe on 2014-02-06

[r=rogpeppe] juju-restore: fix

We can no longer log in to mongo with the
admin secret, so we change juju-restore
to use the machine agent credentials instead.


2301. By Andrew Wilkins on 2014-02-06

[r=axwalk] cmd/juju: log --force usage on failed destroy-env

If juju destroy-environment fails and --force has
not been specified, log an error message that informs
the user about the --force flag.


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.