lp:~free.ekanayaka/landscape-charm/cleanup-legacy-integration-tests

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~landscape/landscape-charm/trunk at revision 251

Chris Glass (community): Approve on 2015-04-21

Adam Collard (community): Approve on 2015-04-20

🤖 Landscape Builder: Approve (test results) on 2015-04-20

Diff: 234 lines (+14/-119)

3 files modified

templates/service.conf (+6/-0)
tests/01-begin.py (+8/-95)
tests/helpers.py (+0/-24)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1444865: Some integration tests are legacy

Medium

Fix Released

Link a bug report

Related blueprints

251. By Free Ekanayaka on 2015-04-20

Merge from trunk, fix conflicts

250. By Free Ekanayaka on 2015-04-20

Address review comments

249. By Free Ekanayaka on 2015-04-16

Clean up integration tests

248. By Chris Glass on 2015-04-15

Fix integration tests.

247. By Chris Glass on 2015-04-15

Updated svg charm icon to the design-approved one [trivial] [a=sparkiegeek]

246. By Chris Glass on 2015-04-13

Merge add-ssl-configuration [f=1441048] [r=free.ekanayaka,landscape-builder,benji] [a=Chris Glass]
This branch introduces two new configuration keys for the landscape-charm: ssl-cert
and ssl-key, expecting a b64 encoded vertificate and b64 key to be used as
the ssl certificate the landscape server will present to the world.

The values are passed to the HAproxy charm via its wesite relation.

245. By Chris Glass on 2015-04-09

Merge extract_common_test_helpers [f=1442094] [r=danilo,free.ekanayaka,landscape-builder] [a=Chris Glass]
This branch moves some common code into a helpers.py file (there is no actual code change), and adds a couple of conf/ file options to inject ssl_key and ssl_cert in the charm configuration.

244. By Данило Шеган on 2015-04-08

Merge reconfigure-on-unit-departure [f=1440862] [r=adam-collard,landscape-builder,free.ekanayaka] [a=Данило Шеган]
Reconfigure units on cluster-relation-depart hook

When a unit leaves the cluster, regenerate /etc/landscape/service.conf and /etc/default/landscape-server in case unit that has left the cluster was a leader and a new leader is elected.

This ensures that cronjobs switch to the new leader once the previous one disappears.

243. By Free Ekanayaka on 2015-04-08

Merge enable-juju-sync [f=1439993] [r=ack,adam-collard,landscape-builder] [a=Free Ekanayaka]
This branch enables the juju-sync process on the leader unit, if
the deployment is a standalone deployment.

In order to fix the main bug, I also had to fix a side bug, i.e. handling
the relation with the landscape-hosted charm, so we know which deployment
mode we're deployed with (and hence whether to fire juju-sync or not). Since
the final branch is not too big, I'm pushing everything in one go.

242. By Chris Glass on 2015-04-07

Merge send-haproxy-error-in-relation [f=1431783] [r=free.ekanayaka,danilo,landscape-builder] [a=Chris Glass]
This branch adds errorfiles to the haproxy relation.