Merge lp://staging/~frankban/juju-quickstart/trusty-charm into lp://staging/juju-quickstart
Status: | Merged |
---|---|
Merged at revision: | 66 |
Proposed branch: | lp://staging/~frankban/juju-quickstart/trusty-charm |
Merge into: | lp://staging/juju-quickstart |
Diff against target: |
1390 lines (+604/-294) 13 files modified
quickstart/__init__.py (+1/-1) quickstart/app.py (+76/-24) quickstart/cli/views.py (+3/-2) quickstart/manage.py (+12/-14) quickstart/models/envs.py (+8/-2) quickstart/settings.py (+18/-13) quickstart/tests/cli/test_views.py (+1/-1) quickstart/tests/helpers.py (+23/-10) quickstart/tests/models/test_envs.py (+15/-4) quickstart/tests/test_app.py (+324/-190) quickstart/tests/test_manage.py (+77/-7) quickstart/tests/test_utils.py (+23/-13) quickstart/utils.py (+23/-13) |
To merge this branch: | bzr merge lp://staging/~frankban/juju-quickstart/trusty-charm |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+216921@code.staging.launchpad.net |
Description of the change
Support trusty environments.
Add the ability to deploy the trusty charm.
Introduced the concept of multiple supported
series for the Juju GUI charm.
Split the app.deploy_gui function in two
separate function:
- check_environment inspects the environment
and returns the data required to deploy the GUI;
- deploy_gui's only responsibility is to
return when the GUI service is deployed/exposed
and the unit created.
Include the default-series field in the auto-generated
local environment. This is the environment that
quickstart offers to automatically create when no other
environments are found.
Also propose "trusty" as the default series when manually
creating new environments.
Bump version up: while this branch
incidentally fixes bug 1306537 [1],
the ability to deploy the GUI on trusty
can be considered a new feature.
My apologies for the long diff.
Tests: `make check`.
QA:
Use quickstart like the following:
`.venv/bin/python juju-quickstart [-i]`.
You should be able to deploy the trusty GUI charm.
If you are on trusty, the trusty charm should be deployed
when the default-series field is missing.
This must be tested also using the local provider, in which case
Juju is currently not able to deploy precise charms when the
bootstrap node is trusty (bug 1306537).
In general quickstart should deploy the charm series corresponding
to the bootstrap node series: so on trusty environments the trusty
charm should be installed, on precise environments the precise one.
This way, at least when the bootstrap node series is precise or trusty,
quickstart is able to add the GUI unit to machine 0. You can test it
using, e.g. an ec2 environment.
This is true also when providing a custom charm URL, e.g.:
`.venv/bin/python juju-quickstart --gui-charm-url cs:~juju-
In all the other cases, quickstart uses the trusty charm. You can test this
by using quickstart with an ec2 environment having "default-series: saucy":
a trusty GUI should be deployed on machine 1.
Two final checks:
- try to create a new environment with quickstart: the default-series
field should be pre-filled with "trusty";
- move temporarily your environments.yaml somewhere else, and let quickstart
auto-generate a local environment for you: the deployment process should
succeed and the environment should include the "trusty" default series.
Thanks a lot for all of this, and sorry for the long QA: this is going to
be released in trusty, so your efforts are really appreciated!
Reviewers: mp+216921_ code.launchpad. net,
Message:
Please take a look.
Description:
Support trusty environments.
Add the ability to deploy the trusty charm.
Introduced the concept of multiple supported
series for the Juju GUI charm.
Split the app.deploy_gui function in two
separate function:
- check_environment inspects the environment
and returns the data required to deploy the GUI;
- deploy_gui's only responsibility is to
return when the GUI service is deployed/exposed
and the unit created.
Include the default-series field in the auto-generated
local environment. This is the environment that
quickstart offers to automatically create when no other
environments are found.
Also propose "trusty" as the default series when manually
creating new environments.
Bump version up: while this branch
incidentally fixes bug 1306537 [1],
the ability to deploy the GUI on trusty
can be considered a new feature.
My apologies for the long diff.
Tests: `make check`.
QA: bin/python juju-quickstart [-i]`.
Use quickstart like the following:
`.venv/
You should be able to deploy the trusty GUI charm.
If you are on trusty, the trusty charm should be deployed
when the default-series field is missing.
This must be tested also using the local provider, in which case
Juju is currently not able to deploy precise charms when the
bootstrap node is trusty (bug 1306537).
In general quickstart should deploy the charm series corresponding
to the bootstrap node series: so on trusty environments the trusty
charm should be installed, on precise environments the precise one.
This way, at least when the bootstrap node series is precise or trusty,
quickstart is able to add the GUI unit to machine 0. You can test it
using, e.g. an ec2 environment.
This is true also when providing a custom charm URL, e.g.: bin/python juju-quickstart --gui-charm-url gui/trusty/ juju-gui- 1`
`.venv/
cs:~juju-
In all the other cases, quickstart uses the trusty charm. You can test
this
by using quickstart with an ec2 environment having "default-series:
saucy":
a trusty GUI should be deployed on machine 1.
Two final checks:
- try to create a new environment with quickstart: the default-series
field should be pre-filled with "trusty";
- move temporarily your environments.yaml somewhere else, and let
quickstart
auto-generate a local environment for you: the deployment process
should
succeed and the environment should include the "trusty" default
series.
Thanks a lot for all of this, and sorry for the long QA: this is going
to
be released in trusty, so your efforts are really appreciated!
[1] https:/ /bugs.launchpad .net/juju- core/+bug/ 1306537
https:/ /code.launchpad .net/~frankban/ juju-quickstart /trusty- charm/+ merge/216921
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/90570044/
Affected files (+605, -294 lines): __init_ _.py cli/views. py manage. py models/ envs.py settings. py tests/cli/ test_views. py tests/helpers. py tests/models/ test_envs. py
A [revision details]
M quickstart/
M quickstart/app.py
M quickstart/
M quickstart/
M quickstart/
M quickstart/
M quickstart/
M quickstart/
M quickstart/
M q...