lp://qastaging/~tribaal/landscape-charm/source-ux-improvements

Branch merges

Propose for merging

No branches dependent on this one.

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

Adam Collard (community): Approve on 2015-06-24

Alberto Donato (community): Approve on 2015-06-24

🤖 Landscape Builder: Approve (test results) on 2015-06-23

Diff: 77 lines (+23/-3)

4 files modified

config.yaml (+6/-2)
lib/apt.py (+6/-0)
lib/tests/test_apt.py (+10/-0)
metadata.yaml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1447139: Support more user-friendly source config option values

Medium

Fix Released

Link a bug report

Related blueprints

320. By Chris Glass on 2015-06-24

Narrowed down the regexp as suggested.

319. By Chris Glass on 2015-06-23

As suggested by "charm proof", s/categories/tags/

318. By Chris Glass on 2015-06-23

Added shorthand version numbers mapping to PPAs.

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

Merge deploy-landscape-client [f=1466433] [r=landscape-builder,chad.smith,adam-collard] [a=Björn Tillenius]
Add a script for deploying landscape-client after deploying landscape-server.

The client will be configured with the right URLs and SSL certficate, so
that the deployed client will register with the deployed server.

Only the suboordinate server will be deployed. To actually get some
clients registered you have to deploy some service (like ubuntu)
yourself and relate landscape-client to it.

316. By Данило Шеган on 2015-06-19

Merge api-endpoint [f=1463955] [r=landscape-builder,free.ekanayaka,adam-collard] [a=Данило Шеган]
Change API and package-upload root-urls to use the haproxy IP

This will ensure we are using the right base URL for the API endpoint on the /settings page.

However, the full URL will still be incorrect: "/api/" needs to be appended to it: we need to fix that in the landscape codebase.

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.