Merge lp://staging/~hatch/charms/trusty/juju-gui/add-uuid-configjs into lp://staging/~juju-gui/charms/trusty/juju-gui/trunk
Proposed by
Jeff Pihach
| Status: | Merged |
|---|---|
| Approved by: | Jeff Pihach |
| Approved revision: | 233 |
| Merged at revision: | 231 |
| Proposed branch: | lp://staging/~hatch/charms/trusty/juju-gui/add-uuid-configjs |
| Merge into: | lp://staging/~juju-gui/charms/trusty/juju-gui/trunk |
| Diff against target: |
94 lines (+19/-5) 6 files modified
Makefile (+1/-1) config/config.js.template (+2/-1) hooks/backend.py (+2/-1) hooks/utils.py (+2/-1) tests/test_backends.py (+2/-1) tests/test_utils.py (+10/-0) |
| To merge this branch: | bzr merge lp://staging/~hatch/charms/trusty/juju-gui/add-uuid-configjs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Madison Scott-Clary (community) | Approve | ||
| Francesco Banconi | Approve | ||
|
Review via email:
|
|||
Description of the change
Supply the config.js file with the value from the JUJU_ENV_UUID value in supported versions of Juju.
To QA:
Deploy this charm and check that the config.js file sent to the gui has a key juju_env_uuid with a populated uuid value.
To post a comment you must log in.
Revision history for this message
| Jeff Pihach (hatch) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This branch looks good Jeff, thank you!
I have some minor comments, and I'd add a test for write_gui_config in test_utils.
similar to test_write_
QA ok.