lp:~frankban/juju-quickstart/new-bootstrap-strategy

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:juju-quickstart at revision 105

Juju GUI Hackers: Pending requested 2014-11-12

Diff: 1663 lines (+770/-511)

11 files modified

HACKING.rst (+2/-1)
quickstart/app.py (+80/-44)
quickstart/manage.py (+38/-17)
quickstart/netutils.py (+99/-0)
quickstart/tests/helpers.py (+19/-5)
quickstart/tests/test_app.py (+195/-147)
quickstart/tests/test_manage.py (+134/-122)
quickstart/tests/test_netutils.py (+201/-0)
quickstart/tests/test_utils.py (+0/-119)
quickstart/utils.py (+0/-54)
quickstart/watchers.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1387867: always tries to bootstrap .. check the api endpoint instead

High

Fix Released

Link a bug report

Related blueprints

111. By Francesco Banconi on 2014-11-12

Changes as per review.

110. By Francesco Banconi on 2014-11-12

Fix typos.

109. By Francesco Banconi on 2014-11-12

Done.

108. By Francesco Banconi on 2014-11-12

New functions tests.

107. By Francesco Banconi on 2014-11-12

New bootstrap tests.

106. By Francesco Banconi on 2014-11-12

Checkpoint.

105. By Francesco Banconi on 2014-11-11

Checkpoint.

104. By Francesco Banconi on 2014-11-11

Code reorganization + docs.

Reorganize the jenv related code in preparation of the
bootstrap strategy change.

Separate jenv handling from the environments.yaml file
management in models.

As a consequence of only supporting juju >= 1.18 we
can now safely always retrieve the admin-secret from
the jenv file.

Also updated the HACKING docs to include a brief
description of the project structure.

Tests: `make check`.

QA: use quickstart as usual.

R=bac, rharding
CC=
https://codereview.appspot.com/169380043

103. By Francesco Banconi on 2014-11-10

Unit address from the machines watcher only

Only use the mega-watcher for machines to retrieve
the Juju GUI unit address.
This change has several consequences:
- it allows us to apply some logic on how the
  right address is chosen. For instance, now
  we try to resolve public hostnames before
  proceeding, and this should fix the cases
  where a cloud dns is not configured on the
  machine running quickstart. This is the case
  of many maas environments;
- it simplifies parsing the mega-watcher changes;
- more importantly, it breaks compatibility
  with very old versions of juju (<1.18), in which
  the mega-watcher for machines did not include
  machine addresses.

For this reason, quickstart now explicitly
drops support for juju < 1.18.1
(1.18.1 is the version on trusty universe).

This also allows for removing some version
checks in the code, including sudo handling when
calling bootstrap on local envs, several special
cases on the watcher side, and other oddities.

For the reasons above, I bumped the quickstart
version up to 1.5.0.

PS: my apologies for the long diff, hope the code
is still easy to follow. Sorry.

Tests: `make check`

QA:
run quickstart as usual, on local and cloud envs,
check it works properly when run again, etc.
this branch has been already successfully QAed in
a maas environment by Adam (Landscape team).

R=bac, rharding
CC=
https://codereview.appspot.com/174790043

102. By Francesco Banconi on 2014-11-10

Do not hide errors on interactive session.

R=jay.wren, bac
CC=
https://codereview.appspot.com/166420044