lp:~wallyworld/juju-core/openstack-destroy-error

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~juju/juju-core/trunk

Juju Engineering: Pending requested 2013-03-22

Diff: 56 lines (+27/-5)

1 file modified

environs/openstack/storage.go (+27/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1048. By Ian Booth on 2013-03-22

Handle conflict errors on env delete

1047. By Dave Cheney on 2013-03-21

log: change logging format

Update logging format to the spec in

https://canonical.leankit.com/Boards/View/103148069/104301018

% juju status -v
2013/03/21 17:32:59 INFO JUJU:juju:status environs/ec2: opening environment "ap-southeast-1"
2013/03/21 17:33:00 INFO JUJU:juju:status environs/ec2: waiting for DNS name(s) of state server instances [i-8ba7d2dc]
2013/03/21 17:33:01 INFO JUJU:juju:status state: opening state; mongo addresses: ["ec2-54-251-206-23.ap-southeast-1.compute.amazonaws.com:37017"]; entity ""
2013/03/21 17:33:01 INFO JUJU:juju:status state: connecting to 54.251.206.23:37017
2013/03/21 17:33:02 INFO JUJU:juju:status state: connection established

R=wallyworld, fwereade, thumper
CC=
https://codereview.appspot.com/7922044

1046. By Tim Penhey on 2013-03-21

Add series to StartInstance, and remove the tools

In order to facilitate some simpler testing, a helper method was added for
StartInstance.

An unknown series for the dummy provider now raises a NotFoundError saying no
tools, as this is the behaviour that is now happening with the ec2 and
openstack providers.

The series is passed through to the private start instance for the providers
where it is used to find tools, and is also passed into the findInstanceSpec.

R=jameinel, fwereade
CC=
https://codereview.appspot.com/7943043

1045. By Martin Packman on 2013-03-21

Backout r1044 due to test failures on quantal

R=
CC=
https://codereview.appspot.com/7926044

1044. By John A Meinel on 2013-03-21

environs/config: update "default-series"

When "default-series" is not set, have it default to
"precise" rather than version.Current.Series.

R=rog, gz
CC=
https://codereview.appspot.com/7767045

1043. By Francesco Banconi on 2013-03-21

Implement a SetAnnotations API call.

SetAnnotations now sets multiple annotations
on an entity. This is required by the GUI, in
order to have one rpc call for an atomic operation
involving several annotations.

R=matthew.scott, dimitern, dfc, fwereade, rog
CC=
https://codereview.appspot.com/7644043

1042. By Ian Booth on 2013-03-21

Add rsyslog config

This branch generates rsyslog config files so that messages from all nodes
are sent via UDP to the state server node and logged to an all-machines.log file

The cloud init script is altered to generate the rsyslog conf files. Currently
only machine-X.log files are forwarded to the state server. When a new service is
deployed, unit-X.log files are generated but these are not currently forwarded. This
may be addressed in a subsequent branch.

The various forwarded messages from each node are preprended from the node name
like so:
juju-hpcloudx-machine-0 JUJU:jujud:machine: 2013/03/20 03:52:58 NOTICE: cmd/jujud: agent starting

The solution was complicated by the fact that messages from the remote node contain a leading
space. So separate output templates were required to ensure a consistent log file.

R=dimitern, jameinel
CC=
https://codereview.appspot.com/7756045

1041. By Dave Cheney on 2013-03-21

log: fix data race on log.Target

Many of our test cases set the value of log.Target, then reset it during the test/suite teardown. This has always been racy, but we've worked around it. We're now at the point that it can't be hidden anymore. In this case it is the mgo connection retry logic inside the state tests, but it will always be something.

This proposal makes the setting and getting of log.Target() (actually, log.target.logger) thread safe, and introduces a new nilLogger to make the logic inside each of the logging methods.

There is probably also a race on log.Debug, so a similar proposal will be needed as a followup.

Also, as witnessed by the duplication of logic that sets and resets the log.Target, try to push as much of the log target slight of hand into testing.LoggingSuite.

R=jameinel, dimitern, rog, fwereade, thumper
CC=
https://codereview.appspot.com/7524046

1040. By Benji York on 2013-03-20

Add SetServiceConstraints to API

This also involved moving the Constraints struct into its own package in order
to break an import cycle.

R=dfc, bac, dimitern, fwereade
CC=
https://codereview.appspot.com/7600044

1039. By Roger Peppe on 2013-03-20

worker/uniter: disable broken test

The disabled test fails >80% of the time on my
machine.
(this fix pre-LGTM'd by fwereade, so submitting immediately)

R=
CC=
https://codereview.appspot.com/7929043