lp:~rogpeppe/juju-core/502-upgrades-simplify

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 2014-02-14

Diff: 561 lines (+135/-196)

8 files modified

upgrades/lockdirectory.go (+2/-2)
upgrades/lockdirectory_test.go (+4/-2)
upgrades/operations.go (+5/-10)
upgrades/rsyslogconf.go (+7/-7)
upgrades/rsyslogconf_test.go (+4/-4)
upgrades/steps118.go (+13/-16)
upgrades/upgrade.go (+21/-75)
upgrades/upgrade_test.go (+79/-80)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2328. By Roger Peppe on 2014-02-14

upgrades: simplify

2327. By Andrew Wilkins on 2014-02-14

[r=axwalk] Fix test network isolation

Some tests were dialing out. We shouldn't do that.

Fixes lp:1233601

https://codereview.appspot.com/63700043/

2326. By Andrew Wilkins on 2014-02-14

[r=axwalk],[bug=1274780] provider/local: fall back to os/user if $USER=""

If $USER is unset/empty, then fall back to os/user.
If that fails, then return an error.

Fixes lp:1274780

https://codereview.appspot.com/58970043/

2325. By Andrew Wilkins on 2014-02-14

[r=axwalk] provider/local: qualify pkill jujud with home dir

When local was changed to use common code for
bootstrap and destroy, destroy regressed and
would destroy any jujud running on the machine.
This CL fixes it by only killing the jujud that
is located in the environment's data-dir.

https://codereview.appspot.com/61820043/

2324. By Ian Booth on 2014-02-14

[r=wallyworld] Upgrade rsyslog config files

Add upgrade capability for rsyslog config
files. A chunk of code refactoring was also
done. Previously committed code to upgrade
the uniter lock directory was moved to its
own file, plus code to test rsyslog config
contents was pulled out so it could be
reused.

https://codereview.appspot.com/62950043/

2323. By Ian Booth on 2014-02-14

[r=wallyworld],[bug=1237163] Fix instance type selection

Instance type selection will, by default, choose
an instance with enough memory for mong (1024M).
That is unless the user has specified a memory
constraint. If no matching instances are found,
an error is returned. Previously, instead of
an error an arbitary instance with 1024M would
be chosen.

It's perhaps easiest to see the behaviour by
looking at the tests in instancetype_test. With
the old code, several of the tests fail, especially
the memory ones where other constraints are used also.

2322. By Nate Finch on 2014-02-13

[r=natefinch] The voyeur package is intended for use in concurrent environments where multiple people need to read and write a single value, and watchers want to be notified when changes occur to the value.

2321. By Dave Cheney on 2014-02-13

[r=gz],[bug=1273769] simplestreams: add trusty

Lost in the various commit messages was a desire to consolidate the list of
supported series. This proposal is the first of several.

2320. By Andrew Wilkins on 2014-02-13

[r=axwalk] environs: destroy jenv if prepare fails

If Prepare fails mid-way, the .jenv file
can be left behind in some cases.

Fixes lp:1247152

https://codereview.appspot.com/61470046/

2319. By Tim Penhey on 2014-02-13

[r=thumper],[bug=1272112] Fix the juju-run on machines with no units.

This branch also adds an upgrade step to make sure
that existing environments also get the goodness.

https://codereview.appspot.com/62390043/