lp:~bjornt/landscape-charm/upgrade-local

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

288. By Björn Tillenius on 2015-05-22

Merge resume-action [f=1418104] [r=tribaal,free.ekanayaka,landscape-builder] [a=Björn Tillenius]
Add a simple 'resume' action.

It reverses the effects of the 'pause' action.

I also added integration tests to make sure pause and resume work.

287. By Björn Tillenius on 2015-05-21

Merge haproxy-error-pages [f=1454109] [r=tribaal,free.ekanayaka,landscape-builder] [a=Björn Tillenius]
Configure haproxy error pages for non-503 errors.

The changes in charmhelpers/ is the result of a 'make sync'. It's
required to avoid a MAX_ARGS error when setting the relation data.

286. By Chris Glass on 2015-05-21

Merge migrate-schema-action [f=1418103] [r=free.ekanayaka,landscape-builder,ack] [a=Chris Glass]
This branch introduces a minimal "migrate schema" juju action that simply runs the
schema migration script.

In a future branch (tracked by bug #1456953) we will implement a slightly more
secure way of doing so.

285. By Chris Glass on 2015-05-20

Chaned integration-test-trunk to work again. If this is an unknown Make feature we need to disucss it further before reintroducing it
[trivial][r=free]

284. By Björn Tillenius on 2015-05-19

Revert r281 and r282 [trivial]

Those commits were meant to go in a feature branch.

283. By Björn Tillenius on 2015-05-19

Merge ping-msg-unavailable-page-test [f=1455095] [r=ack,free.ekanayaka,landscape-builder] [a=Björn Tillenius]
Renable the tests for ping and message server 503 pages.

The tests were rewritten not to check for unstyled pages. The old charm
used unstyled 503 pages, but for example staging doesn't. Using styled
503 pages is easiest and is consistent with staging.

282. By Björn Tillenius on 2015-05-18

Sync charmhelpers.

281. By Björn Tillenius on 2015-05-18

Add more error pages.

280. By Данило Шеган on 2015-05-15

Merge set-env-in-defaults [f=1455135] [r=chad.smith,adam-collard,landscape-builder] [a=Данило Шеган]
Set DEPLOYED_FROM="charm" in defaults file when deployed with charm

When Landscape is deployed with charm, set the above variable. This is to be sourced into prerm and postinst package scripts to decide whether to start/stop Landscape services (since we want to control package upgrades and service restarts in the charm, we want this extra flexibility).

279. By Данило Шеган on 2015-05-15

Merge fix-package-search [f=1446399] [r=ack,free.ekanayaka,landscape-builder] [a=Данило Шеган]
Fix package-search configuration in service.conf

This fixes [package-search] section in service.conf to match what we usually do for LDS (though our old charm used port 9090: I don't think it matters much which we choose, as long as they are in the 9090-9099 range so as not to overlap with our other services).

This branch also fixes the whitespacing issue (to some extent) by using {%- or -%} which truncates the space to the left and to the right (note the minus sign).