Created by Björn Tillenius on 2015-06-18 and last modified on 2015-06-26
Get this branch:
bzr branch lp:~bjornt/landscape-charm/multiple-rabbit-endpoints
Only Björn Tillenius can upload to this branch. If you are Björn Tillenius please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Björn Tillenius
Landscape Charm

Recent revisions

318. By Björn Tillenius on 2015-06-26

Add a simple integration test.

317. By Björn Tillenius on 2015-06-23

Re-use the old host option.

316. By Björn Tillenius on 2015-06-18

Add all rabbit endpoints to service.conf.

315. By Данило Шеган on 2015-06-16

Merge license-file-plain-text [f=1455198] [r=bjornt,tealeg,landscape-builder] [a=Данило Шеган]
Allow license files to be put in as plain text as well

After some discussion, we've decided to support both plain text and base64-encoded data for license-file charm config option (along with URLs to fetch the license from).

This means that we need to base64-decode only when really needed, and base64 module is not helping there.

314. By Björn Tillenius on 2015-06-16

Merge pause-action-fail [f=1458515] [r=landscape-builder,chad.smith,benji] [a=Björn Tillenius]
Make the 'resume' action fail if not all services started.

The 'lsctl start' call returns 0 even if some services didn't start. Now
we check 'lsctl status' as well and flag an error if not all services
are started.

313. By Данило Шеган on 2015-06-15

Merge admin-user-action [f=1462387] [r=landscape-builder,free.ekanayaka,benji] [a=Данило Шеган]
Create bootstrap action that creates an LDS account and adds an admin user

Introduce "bootstrap" action that takes "admin-name", "admin-email" and "admin-password" parameters and creates a "standalone" LDS account with the appropriate admin user.

At the moment, we are using 'schema --create-lds-account-only', though we should move to not using this in the future. This script doesn't report nicely if you've already called 'bootstrap' once.

312. By David Britton on 2015-06-11

s/pep8/flake8/ in the Makefile [trivial] [r=benji]

311. By Björn Tillenius on 2015-06-11

Merge leader-destroyed-integration-tests [f=1464161] [r=free.ekanayaka,adam-collard,landscape-builder] [a=Björn Tillenius]
Add integration tests for when the landscape-server leader dies.

I added tests to ensuring that all services are up and running,
including package-upload which runs only on the leader.

310. By Björn Tillenius on 2015-06-11

Merge integration-tests-no-hardcode-unit [f=1464134] [r=adam-collard,landscape-builder,free.ekanayaka] [a=Björn Tillenius]
Don't hardcode the unit ids in the integration tests.

The tests assumed that landscape-server/0 was always there. This is not
always true, especially not when we'll add a layer that destroys that

I also changed it so that error output is included from the 'juju ssh'
calls. Error output from the cron scripts was already included, but if
the actualy 'juju ssh' call failed, all you saw that the command exited
with error code 1, but you didn't see what the actual problem was.

309. By Free Ekanayaka on 2015-06-11

Merge dont-restart-services-unnecessarily [f=1463697] [r=bjornt,adam-collard,landscape-builder] [a=Free Ekanayaka]
This branch makes the LSCtl callback a bit smarter and avoid restarting services in a few situations that don't require a restart. For instance:

- If the SSL certificate change (since we don't load it in memory)

- If the postgresql relation data changed in a way that doesn't affect connection details (for example a new landscape-server unit was added and it's popping up in the allowed_units key).

There is also a small cleanup of repeated logic for finding a certain key in the required_data list of a ServiceManager.

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.